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/tools/graphics | |
parent | b7c3c25218f8807920318ceb61b70f4343e0bd91 (diff) | |
download | nixpkgs-3b9ef2c71b275c924c4b28caf2f8a765bfc75d14.tar nixpkgs-3b9ef2c71b275c924c4b28caf2f8a765bfc75d14.tar.gz nixpkgs-3b9ef2c71b275c924c4b28caf2f8a765bfc75d14.tar.bz2 nixpkgs-3b9ef2c71b275c924c4b28caf2f8a765bfc75d14.tar.lz nixpkgs-3b9ef2c71b275c924c4b28caf2f8a765bfc75d14.tar.xz nixpkgs-3b9ef2c71b275c924c4b28caf2f8a765bfc75d14.tar.zst nixpkgs-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/tools/graphics')
-rw-r--r-- | pkgs/tools/graphics/cuneiform/default.nix | 2 | ||||
-rw-r--r-- | pkgs/tools/graphics/pngout/default.nix | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/tools/graphics/cuneiform/default.nix b/pkgs/tools/graphics/cuneiform/default.nix index c5d9475850e..6648ec8bc31 100644 --- a/pkgs/tools/graphics/cuneiform/default.nix +++ b/pkgs/tools/graphics/cuneiform/default.nix @@ -25,7 +25,7 @@ rec { mkdir -p $PWD/builddir cd builddir export NIX_LDFLAGS="$NIX_LDFLAGS -ldl -L$out/lib" - cmake .. -DCMAKE_BUILD_TYPE=debug -DCMAKE_INSTALL_PREFIX=$out -DDL_LIB=${libc}/lib + cmake .. -DCMAKE_BUILD_TYPE=debug -DCMAKE_INSTALL_PREFIX=$out -DDL_LIB=${libc.out}/lib '') ["minInit" "addInputs" "doUnpack" "defEnsureDir"]; needLib64 = a.stdenv.system == "x86_64-linux"; diff --git a/pkgs/tools/graphics/pngout/default.nix b/pkgs/tools/graphics/pngout/default.nix index 471823ed923..afc1a2519fe 100644 --- a/pkgs/tools/graphics/pngout/default.nix +++ b/pkgs/tools/graphics/pngout/default.nix @@ -18,9 +18,9 @@ stdenv.mkDerivation { cp ${folder}/pngout $out/bin ${if stdenv.system == "i686-linux" then '' - patchelf --set-interpreter ${stdenv.glibc}/lib/ld-linux.so.2 $out/bin/pngout + patchelf --set-interpreter ${stdenv.glibc.out}/lib/ld-linux.so.2 $out/bin/pngout '' else if stdenv.system == "x86_64-linux" then '' - patchelf --set-interpreter ${stdenv.glibc}/lib/ld-linux-x86-64.so.2 $out/bin/pngout + patchelf --set-interpreter ${stdenv.glibc.out}/lib/ld-linux-x86-64.so.2 $out/bin/pngout '' else ""} ''; |