summary refs log tree commit diff
path: root/pkgs/development/libraries/lightning
diff options
context:
space:
mode:
authorJohn Ericson <John.Ericson@Obsidian.Systems>2017-10-10 19:01:42 -0400
committerJohn Ericson <John.Ericson@Obsidian.Systems>2017-11-13 00:47:48 -0500
commitd7bddc27b23da8ce7bc19cfeeeb0cbebdb5a4410 (patch)
tree075aa2008d4bd95a79b8c63827284cc69764c58b /pkgs/development/libraries/lightning
parentf72bffb4c4178bf648bffff2a6692684f69551cd (diff)
downloadnixpkgs-d7bddc27b23da8ce7bc19cfeeeb0cbebdb5a4410.tar
nixpkgs-d7bddc27b23da8ce7bc19cfeeeb0cbebdb5a4410.tar.gz
nixpkgs-d7bddc27b23da8ce7bc19cfeeeb0cbebdb5a4410.tar.bz2
nixpkgs-d7bddc27b23da8ce7bc19cfeeeb0cbebdb5a4410.tar.lz
nixpkgs-d7bddc27b23da8ce7bc19cfeeeb0cbebdb5a4410.tar.xz
nixpkgs-d7bddc27b23da8ce7bc19cfeeeb0cbebdb5a4410.tar.zst
nixpkgs-d7bddc27b23da8ce7bc19cfeeeb0cbebdb5a4410.zip
treewide: Try to avoid depending on binutils directly
One should depend on

 - `stdenv.cc.bintools`: for executables at build time
 - `libbfd` or `libiberty`: for those libraries
 - `targetPackages.cc.bintools`: for exectuables at *run* time
 - `binutils`: only for specifically GNU Binutils's executables, regardless of
   the host platform, at run time.
Diffstat (limited to 'pkgs/development/libraries/lightning')
-rw-r--r--pkgs/development/libraries/lightning/default.nix5
1 files changed, 2 insertions, 3 deletions
diff --git a/pkgs/development/libraries/lightning/default.nix b/pkgs/development/libraries/lightning/default.nix
index 5868fdf8b63..b4a33bbe7df 100644
--- a/pkgs/development/libraries/lightning/default.nix
+++ b/pkgs/development/libraries/lightning/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, binutils }:
+{ stdenv, fetchurl, libopcodes }:
 
 with stdenv.lib;
 stdenv.mkDerivation rec {
@@ -11,8 +11,7 @@ stdenv.mkDerivation rec {
     sha256 = "19j9nwl88k660045s40cbz5zrl1wpd2mcxnnc8qqnnaj311a58qz";
   };
 
-  # Needs libopcodes.so from binutils for 'make check'
-  buildInputs = [ binutils ];
+  buildInputs = stdenv.lib.optional doCheck libopcodes;
 
   doCheck = true;