Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: c5ea58030f9c
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 7251fc2d4599
Choose a head ref
  • 1 commit
  • 1 file changed
  • 1 contributor

Commits on Mar 15, 2019

  1. bitcoinarmory: fix build (#57674) 

    for #56826 see https://hydra.nixos.org/build/90482597/nixlog/2
    @stephengroat @xeji
    stephengroat authored and xeji committed Mar 15, 2019
    Copy the full SHA
    7251fc2 View commit details
Showing with 9 additions and 6 deletions.
  1. +9 −6 pkgs/applications/misc/bitcoinarmory/default.nix
15 changes: 9 additions & 6 deletions pkgs/applications/misc/bitcoinarmory/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{ stdenv, fetchFromGitHub, pythonPackages
, pkgconfig, autoreconfHook, rsync
, swig, qt4, fcgi
, swig, qt48Full, fcgi
, bitcoin, procps, utillinux
}:
let
@@ -16,7 +16,6 @@ in buildPythonApplication {
owner = "goatpig";
repo = "BitcoinArmory";
rev = "v${version}";
#sha256 = "023c7q1glhrkn4djz3pf28ckd1na52lsagv4iyfgchqvw7qm7yx2";
sha256 = "0pjk5qx16n3kvs9py62666qkwp2awkgd87by4karbj7vk6p1l14h"; fetchSubmodules = true;
};

@@ -25,14 +24,18 @@ in buildPythonApplication {
# FIXME bitcoind doesn't die on shutdown. Need some sort of patch to fix that.
#patches = [ ./shutdown-fix.patch ];

nativeBuildInputs = [ pkgconfig ];
buildInputs = [
nativeBuildInputs = [
autoreconfHook
pkgconfig
swig
qt4
fcgi
pyqt4
qt48Full
rsync # used by silly install script (TODO patch upstream)
];
buildInputs = [
qt48Full
fcgi
];

propagatedBuildInputs = [
pyqt4