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

Merge branch 'ericson2314-cross-base' into staging

Browse Source
This commit is contained in:
John Ericson 2017-11-15 12:01:47 -05:00
commit 7c2834d428
2 changed files with 6 additions and 6 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,15 +1,15 @@
{ stdenv { stdenv
, fetchurl, autoreconfHook264, bison, binutils , fetchurl, autoreconfHook264, bison, binutils-raw
, libiberty, zlib , libiberty, zlib
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "libbfd-${version}"; name = "libbfd-${version}";
inherit (binutils) version src; inherit (binutils-raw) version src;
outputs = [ "out" "dev" ]; outputs = [ "out" "dev" ];
patches = binutils.patches ++ [ patches = binutils-raw.patches ++ [
../../tools/misc/binutils/build-components-separately.patch ../../tools/misc/binutils/build-components-separately.patch
]; ];

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

@ -1,15 +1,15 @@
{ stdenv, buildPackages { stdenv, buildPackages
, fetchurl, autoreconfHook264, bison, binutils , fetchurl, autoreconfHook264, bison, binutils-raw
, libiberty, libbfd , libiberty, libbfd
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "libopcodes-${version}"; name = "libopcodes-${version}";
inherit (binutils) version src; inherit (binutils-raw) version src;
outputs = [ "out" "dev" ]; outputs = [ "out" "dev" ];
patches = binutils.patches ++ [ patches = binutils-raw.patches ++ [
../../tools/misc/binutils/build-components-separately.patch ../../tools/misc/binutils/build-components-separately.patch
]; ];