Skip to content

Commit

Permalink
Merge #629: update nixpkgs
Browse files Browse the repository at this point in the history
aca0b1e update nixpkgs (Jonas Nick)

Pull request description:

ACKs for top commit:
  erikarvstedt:
    ACK aca0b1e

Tree-SHA512: de44d8ad85665d0e0a7d79ed06bdc70cd3c831d06f58d237bd75b50a14c2cc02f7c1252350962884ef8bb9b35fccf1ecabedf883a516d6c054938381b0998d9a
  • Loading branch information
jonasnick committed Jul 29, 2023
2 parents d8954ec + aca0b1e commit 369ce1c
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 11 deletions.
18 changes: 9 additions & 9 deletions flake.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 0 additions & 2 deletions pkgs/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -15,13 +15,11 @@ let self = {
# when https://github.com/bitcoin/bitcoin/issues/27722 has been resolved
bitcoin = pkgsUnstable.libsForQt5.callPackage ./bitcoin {
stdenv = if pkgsUnstable.stdenv.isDarwin then pkgsUnstable.darwin.apple_sdk_11_0.stdenv else pkgsUnstable.stdenv;
boost = pkgsUnstable.boost17x;
withGui = true;
inherit (pkgsUnstable.darwin) autoSignDarwinBinariesHook;
};

bitcoind = pkgsUnstable.callPackage ./bitcoin {
boost = pkgsUnstable.boost17x;
withGui = false;
inherit (pkgsUnstable.darwin) autoSignDarwinBinariesHook;
};
Expand Down

0 comments on commit 369ce1c

Please sign in to comment.