JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

libiberty, libbfd: Make hash less fickle

Browse Source 
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.
This commit is contained in:
John Ericson 2018-02-20 21:27:57 -05:00
parent 7d37688d66
commit 1c00a8afd7
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/development/libraries/libbfd/default.nix
View File

@ -1,8 +1,10 @@
{ stdenv { stdenv, buildPackages
, fetchurl, fetchpatch, gnu-config, autoreconfHook264, bison, binutils-raw , fetchurl, fetchpatch, gnu-config, autoreconfHook264, bison
, libiberty, zlib , libiberty, zlib
}: }:
let inherit (buildPackages.buildPackages) binutils-raw; in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "libbfd-${version}"; name = "libbfd-${version}";
inherit (binutils-raw.bintools) version src; inherit (binutils-raw.bintools) version src;

4
pkgs/development/libraries/libiberty/default.nix
View File

@ -1,4 +1,6 @@
{ stdenv, fetchurl, gcc, staticBuild ? false }: { stdenv, buildPackages, fetchurl, staticBuild ? false }:
let inherit (buildPackages.buildPackages) gcc; in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "libiberty-${gcc.cc.version}"; name = "libiberty-${gcc.cc.version}";