diff options
| author | Tuomas Tynkkynen <tuomas@tuxera.com> | 2016-01-24 09:28:57 +0200 |
|---|---|---|
| committer | Tuomas Tynkkynen <tuomas@tuxera.com> | 2016-01-24 10:03:33 +0200 |
| commit | c2ceed1ad143bf231402a8e010bcc5270a1930aa (patch) | |
| tree | 2b676a46f2b0e6716b00cc500dadf442be2ad701 /pkgs | |
| parent | f412f5f3ee1ccfe909cb925fba92a4567f686869 (diff) | |
| download | nixpkgs-c2ceed1ad143bf231402a8e010bcc5270a1930aa.tar nixpkgs-c2ceed1ad143bf231402a8e010bcc5270a1930aa.tar.gz nixpkgs-c2ceed1ad143bf231402a8e010bcc5270a1930aa.tar.bz2 nixpkgs-c2ceed1ad143bf231402a8e010bcc5270a1930aa.tar.lz nixpkgs-c2ceed1ad143bf231402a8e010bcc5270a1930aa.tar.xz nixpkgs-c2ceed1ad143bf231402a8e010bcc5270a1930aa.tar.zst nixpkgs-c2ceed1ad143bf231402a8e010bcc5270a1930aa.zip | |
treewide: Mass replace 'binutils}/lib' to refer the 'out' output
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/stdenv/linux/make-bootstrap-tools-cross.nix | 2 | ||||
| -rw-r--r-- | pkgs/stdenv/linux/make-bootstrap-tools.nix | 2 | ||||
| -rw-r--r-- | pkgs/top-level/python-packages.nix | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/stdenv/linux/make-bootstrap-tools-cross.nix b/pkgs/stdenv/linux/make-bootstrap-tools-cross.nix index ed2154d00d2..a56d744ab8d 100644 --- a/pkgs/stdenv/linux/make-bootstrap-tools-cross.nix +++ b/pkgs/stdenv/linux/make-bootstrap-tools-cross.nix @@ -213,7 +213,7 @@ rec { for i in as ld ar ranlib nm strip readelf objdump; do cp ${binutils}/bin/$i $out/bin done - cp -d ${binutils}/lib/lib*.so* $out/lib + cp -d ${binutils.out}/lib/lib*.so* $out/lib chmod -R u+w $out diff --git a/pkgs/stdenv/linux/make-bootstrap-tools.nix b/pkgs/stdenv/linux/make-bootstrap-tools.nix index b1a824983a3..117346eb4ed 100644 --- a/pkgs/stdenv/linux/make-bootstrap-tools.nix +++ b/pkgs/stdenv/linux/make-bootstrap-tools.nix @@ -121,7 +121,7 @@ rec { for i in as ld ar ranlib nm strip readelf objdump; do cp ${binutils}/bin/$i $out/bin done - cp -d ${binutils}/lib/lib*.so* $out/lib + cp -d ${binutils.out}/lib/lib*.so* $out/lib chmod -R u+w $out diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index a5fa5974cbf..48db91f1557 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -15067,7 +15067,7 @@ in modules // { preConfigure = '' substituteInPlace setup.py \ --replace '"/usr/include"' '"${pkgs.gdb}/include"' \ - --replace '"/usr/lib"' '"${pkgs.binutils}/lib"' + --replace '"/usr/lib"' '"${pkgs.binutils.out}/lib"' ''; meta = { |