jacobpascual/nix-bitcoin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge fort-nix/nix-bitcoin#640: pkgs/bitcoind: use pkgs instead of pkgsUnstable

Browse Source 
ff30af6ed3 pkgs/bitcoind: use `pkgs` instead of `pkgsUnstable` (Erik Arvstedt)

Pull request description:

ACKs for top commit:
  jonasnick:
    ACK ff30af6ed3

Tree-SHA512: 756267aedbb166e315daaeab6c0dd3869df2ff57e076fb67cc55e4242a76b201eae4ff0512950280b4298438dc655ed5e8d22588722e4235b05baa7f4e59237a
This commit is contained in:
Jonas Nick
2023-09-04 19:34:27 +00:00
parent b98c0292cd ff30af6ed3
commit d5d3f064e6
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
pkgs/default.nix
View File

@@ -13,15 +13,15 @@ let self = {
# TODO-EXTERNAL: # TODO-EXTERNAL:
# Remove bitcoin and bitcoind 24.1 packages and replace with 25.0 from nixpkgs # Remove bitcoin and bitcoind 24.1 packages and replace with 25.0 from nixpkgs
# when https://github.com/bitcoin/bitcoin/issues/27722 has been resolved # when https://github.com/bitcoin/bitcoin/issues/27722 has been resolved
bitcoin = pkgsUnstable.libsForQt5.callPackage ./bitcoin { bitcoin = pkgs.libsForQt5.callPackage ./bitcoin {
stdenv = if pkgsUnstable.stdenv.isDarwin then pkgsUnstable.darwin.apple_sdk_11_0.stdenv else pkgsUnstable.stdenv; stdenv = if pkgs.stdenv.isDarwin then pkgs.darwin.apple_sdk_11_0.stdenv else pkgs.stdenv;
withGui = true; withGui = true;
inherit (pkgsUnstable.darwin) autoSignDarwinBinariesHook; inherit (pkgs.darwin) autoSignDarwinBinariesHook;
}; };
bitcoind = pkgsUnstable.callPackage ./bitcoin { bitcoind = pkgs.callPackage ./bitcoin {
withGui = false; withGui = false;
inherit (pkgsUnstable.darwin) autoSignDarwinBinariesHook; inherit (pkgs.darwin) autoSignDarwinBinariesHook;
}; };
clightning-rest = pkgs.callPackage ./clightning-rest { inherit (self) fetchNodeModules; }; clightning-rest = pkgs.callPackage ./clightning-rest { inherit (self) fetchNodeModules; };
clboss = pkgs.callPackage ./clboss { }; clboss = pkgs.callPackage ./clboss { };