Clone of https://github.com/NixOS/nixpkgs.git (to stress-test knotserver)

bitcoinarmory: fix build (#57674)

for #56826 see https://hydra.nixos.org/build/90482597/nixlog/2

(cherry picked from commit 7251fc2d4599770a7bf58de8d41f98b907dae829)

authored by

Stephen and committed by
Uli Baum
0464cbf1 7bb2b0c7

+9 -6
+9 -6
pkgs/applications/misc/bitcoinarmory/default.nix
··· 1 1 { stdenv, fetchFromGitHub, pythonPackages 2 2 , pkgconfig, autoreconfHook, rsync 3 - , swig, qt4, fcgi 3 + , swig, qt48Full, fcgi 4 4 , bitcoin, procps, utillinux 5 5 }: 6 6 let ··· 16 16 owner = "goatpig"; 17 17 repo = "BitcoinArmory"; 18 18 rev = "v${version}"; 19 - #sha256 = "023c7q1glhrkn4djz3pf28ckd1na52lsagv4iyfgchqvw7qm7yx2"; 20 19 sha256 = "0pjk5qx16n3kvs9py62666qkwp2awkgd87by4karbj7vk6p1l14h"; fetchSubmodules = true; 21 20 }; 22 21 ··· 25 24 # FIXME bitcoind doesn't die on shutdown. Need some sort of patch to fix that. 26 25 #patches = [ ./shutdown-fix.patch ]; 27 26 28 - nativeBuildInputs = [ pkgconfig ]; 29 - buildInputs = [ 27 + nativeBuildInputs = [ 30 28 autoreconfHook 29 + pkgconfig 31 30 swig 32 - qt4 31 + pyqt4 32 + qt48Full 33 + rsync # used by silly install script (TODO patch upstream) 34 + ]; 35 + buildInputs = [ 36 + qt48Full 33 37 fcgi 34 - rsync # used by silly install script (TODO patch upstream) 35 38 ]; 36 39 37 40 propagatedBuildInputs = [