mirror of
https://github.com/pimalaya/himalaya.git
synced 2024-12-09 21:18:39 +03:00
remove empty libgcc_eh
This commit is contained in:
@@ -54,7 +54,6 @@ let
|
||||
pkg-config = pkgs.pkg-config;
|
||||
buildNoDefaultFeatures = !defaultFeatures;
|
||||
buildFeatures = lib.strings.splitString "," features;
|
||||
libunwind = pkgs.llvmPackages.libunwind;
|
||||
};
|
||||
|
||||
# HACK: https://github.com/NixOS/nixpkgs/issues/177129
|
||||
@@ -73,7 +72,7 @@ himalaya.overrideAttrs (drv: {
|
||||
version = "1.0.0";
|
||||
|
||||
propagatedBuildInputs = (drv.propagatedBuildInputs or [ ])
|
||||
++ lib.optional hostPlatform.isWindows empty-libgcc_eh;
|
||||
++ lib.optional false empty-libgcc_eh;
|
||||
|
||||
postInstall = (drv.postInstall or "") + lib.optionalString hostPlatform.isWindows ''
|
||||
export WINEPREFIX="$(${lib.getExe' mktemp "mktemp"} -d)"
|
||||
|
||||
19
package.nix
19
package.nix
@@ -1,5 +1,4 @@
|
||||
{ lib
|
||||
, libunwind
|
||||
, pkg-config
|
||||
, rustPlatform
|
||||
, windows
|
||||
@@ -30,14 +29,14 @@ rustPlatform.buildRustPackage rec {
|
||||
|
||||
cargoHash = "sha256-YS8IamapvmdrOPptQh2Ef9Yold0IK1XIeGs0kDIQ5b8=";
|
||||
|
||||
NIX_LDFLAGS = lib.optionals (stdenv.hostPlatform.isWindows && stdenv.hostPlatform.isi686) [
|
||||
"-L${windows.mcfgthreads}/lib"
|
||||
"-L${libunwind}/lib"
|
||||
# "-L${windows.mingwrt}/lib"
|
||||
#"-L${windows.w32api}/lib"
|
||||
"-lmcfgthread"
|
||||
"-lunwind"
|
||||
];
|
||||
# NIX_LDFLAGS = lib.optionals (stdenv.hostPlatform.isWindows && stdenv.hostPlatform.isi686) [
|
||||
# "-L${windows.mcfgthreads}/lib"
|
||||
# "-L${libunwind}/lib"
|
||||
# # "-L${windows.mingwrt}/lib"
|
||||
# #"-L${windows.w32api}/lib"
|
||||
# "-lmcfgthread"
|
||||
# "-lunwind"
|
||||
# ];
|
||||
|
||||
# unit tests only
|
||||
doCheck = false;
|
||||
@@ -49,7 +48,7 @@ rustPlatform.buildRustPackage rec {
|
||||
|
||||
buildInputs = [ ]
|
||||
++ lib.optional stdenv.hostPlatform.isDarwin apple-sdk
|
||||
++ lib.optional (stdenv.hostPlatform.isWindows && stdenv.hostPlatform.isi686) windows.mcfgthreads
|
||||
# ++ lib.optional (stdenv.hostPlatform.isWindows && stdenv.hostPlatform.isi686) windows.mcfgthreads
|
||||
++ lib.optional (builtins.elem "notmuch" buildFeatures) notmuch
|
||||
++ lib.optional (builtins.elem "pgp-gpg" buildFeatures) gpgme;
|
||||
|
||||
|
||||
Reference in New Issue
Block a user