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/development/interpreters | |
| parent | b7c3c25218f8807920318ceb61b70f4343e0bd91 (diff) | |
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/development/interpreters')
| -rw-r--r-- | pkgs/development/interpreters/luajit/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/development/interpreters/perl/5.16/default.nix | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/development/interpreters/luajit/default.nix b/pkgs/development/interpreters/luajit/default.nix index f0d9d03991b8..6e596ba43743 100644 --- a/pkgs/development/interpreters/luajit/default.nix +++ b/pkgs/development/interpreters/luajit/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { '' + stdenv.lib.optionalString (stdenv.cc.libc != null) '' substituteInPlace Makefile \ - --replace ldconfig ${stdenv.cc.libc}/sbin/ldconfig + --replace ldconfig ${stdenv.cc.libc.bin}/bin/ldconfig ''; configurePhase = false; diff --git a/pkgs/development/interpreters/perl/5.16/default.nix b/pkgs/development/interpreters/perl/5.16/default.nix index b3bc6aafde96..b293aa2541f0 100644 --- a/pkgs/development/interpreters/perl/5.16/default.nix +++ b/pkgs/development/interpreters/perl/5.16/default.nix @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { "-Dinstallstyle=lib/perl5" "-Duseshrplib" "-Dlocincpth=${libc}/include" - "-Dloclibpth=${libc}/lib" + "-Dloclibpth=${libc.out}/lib" ] ++ lib.optional enableThreading "-Dusethreads"; |