From b2343099ab9667108b8dca9d1b3efc056b6ceb4e Mon Sep 17 00:00:00 2001 From: Tuomas Tynkkynen Date: Sat, 4 Feb 2017 23:38:48 +0200 Subject: [PATCH] make-bootstrap-tools{,-cross}.nix: Fix build after binutils changes Broken after commit 17a344a ("binutils: Add lib output"). --- pkgs/stdenv/linux/make-bootstrap-tools-cross.nix | 2 +- pkgs/stdenv/linux/make-bootstrap-tools.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/stdenv/linux/make-bootstrap-tools-cross.nix b/pkgs/stdenv/linux/make-bootstrap-tools-cross.nix index dda1f7e0b33..1a762bd87c7 100644 --- a/pkgs/stdenv/linux/make-bootstrap-tools-cross.nix +++ b/pkgs/stdenv/linux/make-bootstrap-tools-cross.nix @@ -229,7 +229,7 @@ rec { for i in as ld ar ranlib nm strip readelf objdump; do cp ${binutils.out}/bin/$i $out/bin done - cp -d ${binutils.out}/lib/lib*.so* $out/lib + cp -d ${binutils.lib}/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 2e7b24af131..42015a79a3e 100644 --- a/pkgs/stdenv/linux/make-bootstrap-tools.nix +++ b/pkgs/stdenv/linux/make-bootstrap-tools.nix @@ -126,7 +126,7 @@ rec { for i in as ld ar ranlib nm strip readelf objdump; do cp ${binutils.out}/bin/$i $out/bin done - cp -d ${binutils.out}/lib/lib*.so* $out/lib + cp -d ${binutils.lib}/lib/lib*.so* $out/lib chmod -R u+w $out