diff options
| author | Pavol Rusnak <pavol@rusnak.io> | 2022-09-21 11:46:44 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-09-21 11:46:44 +0200 |
| commit | 0615155dab4a29b4188097841249586eb5ade442 (patch) | |
| tree | 3e6bad805bc71ce05a74fc38d71dd9184d4480a3 | |
| parent | 19aa0eb4dec3c60436387771057de998298b3cd6 (diff) | |
| parent | cbcdc23b9d1811f16b02e2ae38c75cb4f61ede7e (diff) | |
Merge pull request #192100 from prusnak/elements-aarch64-darwin
elements: fix build on aarch64-darwin (apply changes from bitcoin)
| -rw-r--r-- | pkgs/applications/blockchains/elements/default.nix | 8 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 2 |
2 files changed, 9 insertions, 1 deletions
diff --git a/pkgs/applications/blockchains/elements/default.nix b/pkgs/applications/blockchains/elements/default.nix index 3c07b9b2cca9e..be8f4ebb9f86e 100644 --- a/pkgs/applications/blockchains/elements/default.nix +++ b/pkgs/applications/blockchains/elements/default.nix @@ -5,6 +5,7 @@ , pkg-config , util-linux , hexdump +, autoSignDarwinBinariesHook , wrapQtAppsHook ? null , boost , libevent @@ -37,6 +38,7 @@ stdenv.mkDerivation rec { [ autoreconfHook pkg-config ] ++ optionals stdenv.isLinux [ util-linux ] ++ optionals stdenv.isDarwin [ hexdump ] + ++ optionals (stdenv.isDarwin && stdenv.isAarch64) [ autoSignDarwinBinariesHook ] ++ optionals withGui [ wrapQtAppsHook ]; buildInputs = [ boost libevent miniupnpc zeromq zlib ] @@ -56,12 +58,16 @@ stdenv.mkDerivation rec { "--with-qt-bindir=${qtbase.dev}/bin:${qttools.dev}/bin" ]; + # fix "Killed: 9 test/test_bitcoin" + # https://github.com/NixOS/nixpkgs/issues/179474 + hardeningDisable = lib.optionals (stdenv.isAarch64 && stdenv.isDarwin) [ "fortify" "stackprotector" ]; + checkInputs = [ python3 ]; doCheck = true; checkFlags = - [ "LC_ALL=C.UTF-8" ] + [ "LC_ALL=en_US.UTF-8" ] # QT_PLUGIN_PATH needs to be set when executing QT, which is needed when testing Bitcoin's GUI. # See also https://github.com/NixOS/nixpkgs/issues/24256 ++ optional withGui "QT_PLUGIN_PATH=${qtbase}/${qtbase.qtPluginPrefix}"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0e599e5cc261d..ec53eedd77ffe 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -32822,11 +32822,13 @@ with pkgs; miniupnpc = miniupnpc_2; withGui = true; boost = boost175; + inherit (darwin) autoSignDarwinBinariesHook; }; elementsd = callPackage ../applications/blockchains/elements { miniupnpc = miniupnpc_2; withGui = false; boost = boost175; + inherit (darwin) autoSignDarwinBinariesHook; }; ergo = callPackage ../applications/blockchains/ergo { }; |