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/science | |
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/science')
-rw-r--r-- | pkgs/applications/science/electronics/tkgate/1.x.nix | 4 | ||||
-rw-r--r-- | pkgs/applications/science/electronics/tkgate/2.x.nix | 4 | ||||
-rw-r--r-- | pkgs/applications/science/logic/tptp/default.nix | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/pkgs/applications/science/electronics/tkgate/1.x.nix b/pkgs/applications/science/electronics/tkgate/1.x.nix index e9849d0460c8..c62ecdcd1e2a 100644 --- a/pkgs/applications/science/electronics/tkgate/1.x.nix +++ b/pkgs/applications/science/electronics/tkgate/1.x.nix @@ -1,8 +1,8 @@ { stdenv, fetchurl, tcl, tk, libX11, glibc, which, yacc, flex, imake, xproto, gccmakedep }: let - libiconvInc = stdenv.lib.optionalString stdenv.isLinux "${glibc}/include"; - libiconvLib = stdenv.lib.optionalString stdenv.isLinux "${glibc}/lib"; + libiconvInc = stdenv.lib.optionalString stdenv.isLinux "${glibc.dev}/include"; + libiconvLib = stdenv.lib.optionalString stdenv.isLinux "${glibc.out}/lib"; in stdenv.mkDerivation rec { name = "tkgate-1.8.7"; diff --git a/pkgs/applications/science/electronics/tkgate/2.x.nix b/pkgs/applications/science/electronics/tkgate/2.x.nix index 108986ddefe4..166047a98413 100644 --- a/pkgs/applications/science/electronics/tkgate/2.x.nix +++ b/pkgs/applications/science/electronics/tkgate/2.x.nix @@ -1,8 +1,8 @@ { stdenv, fetchurl, tcl, tk, libX11, glibc }: let - libiconvInc = stdenv.lib.optionalString stdenv.isLinux "${glibc}/include"; - libiconvLib = stdenv.lib.optionalString stdenv.isLinux "${glibc}/lib"; + libiconvInc = stdenv.lib.optionalString stdenv.isLinux "${glibc.dev}/include"; + libiconvLib = stdenv.lib.optionalString stdenv.isLinux "${glibc.out}/lib"; in stdenv.mkDerivation rec { name = "tkgate-2.0-b10"; diff --git a/pkgs/applications/science/logic/tptp/default.nix b/pkgs/applications/science/logic/tptp/default.nix index d4c628587535..f3c0a7917cf3 100644 --- a/pkgs/applications/science/logic/tptp/default.nix +++ b/pkgs/applications/science/logic/tptp/default.nix @@ -65,7 +65,7 @@ rec { '' ["defEnsureDir" "minInit"]; patchBinaries = a.fullDepEntry '' - patchelf --set-interpreter "${pkgsi686Linux.glibc}"/lib/ld-linux.so.* \ + patchelf --set-interpreter "${pkgsi686Linux.glibc.out}"/lib/ld-linux.so.* \ "Scripts/tptp4X" '' ["addInputs"]; |