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/applications/graphics | |
| 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/applications/graphics')
| -rw-r--r-- | pkgs/applications/graphics/darktable/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/applications/graphics/seg3d/default.nix | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/pkgs/applications/graphics/darktable/default.nix b/pkgs/applications/graphics/darktable/default.nix index 0589de8726aa..2f384b0ec91e 100644 --- a/pkgs/applications/graphics/darktable/default.nix +++ b/pkgs/applications/graphics/darktable/default.nix @@ -35,8 +35,8 @@ stdenv.mkDerivation rec { ''; cmakeFlags = [ - "-DPTHREAD_INCLUDE_DIR=${stdenv.glibc}/include" - "-DPTHREAD_LIBRARY=${stdenv.glibc}/lib/libpthread.so" + "-DPTHREAD_INCLUDE_DIR=${stdenv.glibc.dev}/include" + "-DPTHREAD_LIBRARY=${stdenv.glibc.out}/lib/libpthread.so" "-DCMAKE_BUILD_TYPE=Release" "-DBINARY_PACKAGE_BUILD=1" "-DGTK2_GLIBCONFIG_INCLUDE_DIR=${glib}/lib/glib-2.0/include" diff --git a/pkgs/applications/graphics/seg3d/default.nix b/pkgs/applications/graphics/seg3d/default.nix index 23a2d23b1ae1..d645a15b02ea 100644 --- a/pkgs/applications/graphics/seg3d/default.nix +++ b/pkgs/applications/graphics/seg3d/default.nix @@ -13,8 +13,8 @@ stdenv.mkDerivation { patches = [ ./cstdio.patch ]; cmakeFlags = [ - "-DM_LIBRARY=${stdenv.glibc}/lib/libm.so" - "-DDL_LIBRARY=${stdenv.glibc}/lib/libdl.so" + "-DM_LIBRARY=${stdenv.glibc.out}/lib/libm.so" + "-DDL_LIBRARY=${stdenv.glibc.out}/lib/libdl.so" "-DBUILD_UTILS=1" "-DBUILD_SEG3D=1" "-DBUILD_DATAFLOW=0" |