summary refs log tree commit diff
path: root/pkgs/development/libraries/libiberty
diff options
context:
space:
mode:
authorJohn Ericson <John.Ericson@Obsidian.Systems>2018-02-20 21:27:57 -0500
committerJohn Ericson <John.Ericson@Obsidian.Systems>2018-02-24 01:43:09 -0500
commit1c00a8afd710beb2800945252ebd4001850d691a (patch)
tree0765864db5e3db46f02b0434c91b598d9f921497 /pkgs/development/libraries/libiberty
parent7d37688d66bf830767ae39724406abd78347fcfb (diff)
downloadnixpkgs-1c00a8afd710beb2800945252ebd4001850d691a.tar
nixpkgs-1c00a8afd710beb2800945252ebd4001850d691a.tar.gz
nixpkgs-1c00a8afd710beb2800945252ebd4001850d691a.tar.bz2
nixpkgs-1c00a8afd710beb2800945252ebd4001850d691a.tar.lz
nixpkgs-1c00a8afd710beb2800945252ebd4001850d691a.tar.xz
nixpkgs-1c00a8afd710beb2800945252ebd4001850d691a.tar.zst
nixpkgs-1c00a8afd710beb2800945252ebd4001850d691a.zip
libiberty, libbfd: Make hash less fickle
These shouldn't respond to targetPlatform, but previously did. The
reason is somewhat complex: they would rely on the sources of gcc and
binutils, respectively, which *do* depend on the target platform.
Obviously the source is the same in all cases, but when those packages
are no longer preserved from bootstrapping stages their `src` attributes
use a different fetchurl resulting in a changed hash.
Diffstat (limited to 'pkgs/development/libraries/libiberty')
-rw-r--r--pkgs/development/libraries/libiberty/default.nix4
1 files changed, 3 insertions, 1 deletions
diff --git a/pkgs/development/libraries/libiberty/default.nix b/pkgs/development/libraries/libiberty/default.nix
index 6608a3393b1..516e6bbbe88 100644
--- a/pkgs/development/libraries/libiberty/default.nix
+++ b/pkgs/development/libraries/libiberty/default.nix
@@ -1,4 +1,6 @@
-{ stdenv, fetchurl, gcc, staticBuild ? false }:
+{ stdenv, buildPackages, fetchurl, staticBuild ? false }:
+
+let inherit (buildPackages.buildPackages) gcc; in
 
 stdenv.mkDerivation rec {
   name = "libiberty-${gcc.cc.version}";