diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2015-04-26 19:54:51 +0200 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2015-05-05 11:52:08 +0200 |
| commit | 3b9ef2c71b275c924c4b28caf2f8a765bfc75d14 (patch) | |
| tree | 0d6fcf3d6474bdb436c0af0c975efd35df8cd6cf /pkgs/build-support/vm | |
| parent | b7c3c25218f8807920318ceb61b70f4343e0bd91 (diff) | |
| download | nixlib-3b9ef2c71b275c924c4b28caf2f8a765bfc75d14.tar nixlib-3b9ef2c71b275c924c4b28caf2f8a765bfc75d14.tar.gz nixlib-3b9ef2c71b275c924c4b28caf2f8a765bfc75d14.tar.bz2 nixlib-3b9ef2c71b275c924c4b28caf2f8a765bfc75d14.tar.lz nixlib-3b9ef2c71b275c924c4b28caf2f8a765bfc75d14.tar.xz nixlib-3b9ef2c71b275c924c4b28caf2f8a765bfc75d14.tar.zst nixlib-3b9ef2c71b275c924c4b28caf2f8a765bfc75d14.zip | |
fix "libc}/lib" and similar references
Done mostly without any verification. I didn't bother with libc}/include, as the path is still correct.
Diffstat (limited to 'pkgs/build-support/vm')
| -rw-r--r-- | pkgs/build-support/vm/default.nix | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/pkgs/build-support/vm/default.nix b/pkgs/build-support/vm/default.nix index fc41e8ec52ed..9d45fc2d3a74 100644 --- a/pkgs/build-support/vm/default.nix +++ b/pkgs/build-support/vm/default.nix @@ -31,9 +31,9 @@ rec { mkdir -p $out/lib # Copy what we need from Glibc. - cp -p ${pkgs.stdenv.glibc}/lib/ld-linux*.so.? $out/lib - cp -p ${pkgs.stdenv.glibc}/lib/libc.so.* $out/lib - cp -p ${pkgs.stdenv.glibc}/lib/libm.so.* $out/lib + cp -p ${pkgs.stdenv.glibc.out}/lib/ld-linux*.so.? $out/lib + cp -p ${pkgs.stdenv.glibc.out}/lib/libc.so.* $out/lib + cp -p ${pkgs.stdenv.glibc.out}/lib/libm.so.* $out/lib # Copy BusyBox. cp -pd ${pkgs.busybox}/bin/* $out/bin @@ -561,7 +561,7 @@ rec { buildCommand = '' ${createRootFS} - PATH=$PATH:${dpkg}/bin:${dpkg}/bin:${glibc}/bin:${lzma}/bin + PATH=$PATH:${dpkg}/bin:${dpkg}/bin:${glibc.bin}/bin:${lzma}/bin # Unpack the .debs. We do this to prevent pre-install scripts # (which have lots of circular dependencies) from barfing. |