From ff30af6ed3d7a8f16eb6ff7dbe2e25e635e80156 Mon Sep 17 00:00:00 2001 From: Erik Arvstedt Date: Fri, 1 Sep 2023 01:09:54 +0200 Subject: [PATCH] pkgs/bitcoind: use `pkgs` instead of `pkgsUnstable` All deps required by `bitcoind` are available in `pkgs`. --- pkgs/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/default.nix b/pkgs/default.nix index 31a4672..08ac0f6 100644 --- a/pkgs/default.nix +++ b/pkgs/default.nix @@ -13,15 +13,15 @@ let self = { # TODO-EXTERNAL: # 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 - bitcoin = pkgsUnstable.libsForQt5.callPackage ./bitcoin { - stdenv = if pkgsUnstable.stdenv.isDarwin then pkgsUnstable.darwin.apple_sdk_11_0.stdenv else pkgsUnstable.stdenv; + bitcoin = pkgs.libsForQt5.callPackage ./bitcoin { + stdenv = if pkgs.stdenv.isDarwin then pkgs.darwin.apple_sdk_11_0.stdenv else pkgs.stdenv; withGui = true; - inherit (pkgsUnstable.darwin) autoSignDarwinBinariesHook; + inherit (pkgs.darwin) autoSignDarwinBinariesHook; }; - bitcoind = pkgsUnstable.callPackage ./bitcoin { + bitcoind = pkgs.callPackage ./bitcoin { withGui = false; - inherit (pkgsUnstable.darwin) autoSignDarwinBinariesHook; + inherit (pkgs.darwin) autoSignDarwinBinariesHook; }; clightning-rest = pkgs.callPackage ./clightning-rest { inherit (self) fetchNodeModules; }; clboss = pkgs.callPackage ./clboss { };