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

top-level, linux stdenv make boootstrap tools: Fix eval

Browse Source 
Now the NixOS tarball job succeeds again
This commit is contained in:
John Ericson 2017-09-04 11:25:31 -04:00
parent 3601a97e3c
commit 9a1b7cf2ae
3 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/stdenv/linux/make-bootstrap-tools-cross.nix
View File

@ -177,9 +177,9 @@ rec {
# Copy binutils.
for i in as ld ar ranlib nm strip readelf objdump; do
cp ${binutils.out}/bin/$i $out/bin
cp ${binutils.binutils.out}/bin/$i $out/bin
done
cp -d ${binutils.lib}/lib/lib*.so* $out/lib
cp -d ${binutils.binutils.lib}/lib/lib*.so* $out/lib
chmod -R u+w $out

4
pkgs/stdenv/linux/make-bootstrap-tools.nix
View File

@ -126,9 +126,9 @@ rec {
# Copy binutils.
for i in as ld ar ranlib nm strip readelf objdump; do
cp ${binutils.out}/bin/$i $out/bin
cp ${binutils.binutils.out}/bin/$i $out/bin
done
cp -d ${binutils.lib}/lib/lib*.so* $out/lib
cp -d ${binutils.binutils.lib}/lib/lib*.so* $out/lib
chmod -R u+w $out

6
pkgs/top-level/all-packages.nix
View File

@ -11910,7 +11910,11 @@ with pkgs;
crda = callPackage ../os-specific/linux/crda { };
# Darwin package set
darwin = callPackages ./darwin-packages.nix { };
#
# Even though this is a set of packages not single package, use `callPackage`
# not `callPackages` so the per-package callPackages don't have their
# `.override` clobbered. C.F. `llvmPackages` which does the same.
darwin = callPackage ./darwin-packages.nix { };
devicemapper = lvm2;