pkgs/bitcoind: use pkgs instead of pkgsUnstable

All deps required by `bitcoind` are available in `pkgs`.
This commit is contained in:
Erik Arvstedt 2023-09-01 01:09:54 +02:00
parent 70bfb03e88
commit ff30af6ed3
No known key found for this signature in database
GPG Key ID: 33312B944DD97846

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 { };