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/video | |
| 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/video')
| -rw-r--r-- | pkgs/applications/video/avidemux/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/applications/video/gnash/default.nix | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/applications/video/avidemux/default.nix b/pkgs/applications/video/avidemux/default.nix index 485d8c54eb36..96ead862e0e3 100644 --- a/pkgs/applications/video/avidemux/default.nix +++ b/pkgs/applications/video/avidemux/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation { lame faad2 libvorbis yasm libvpx xvidcore libva ] ++ stdenv.lib.optional faacSupport faac; - cmakeFlags = "-DPTHREAD_INCLUDE_DIR=${stdenv.glibc}/include" + + cmakeFlags = "-DPTHREAD_INCLUDE_DIR=${stdenv.glibc.dev}/include" + " -DGETTEXT_INCLUDE_DIR=${gettext}/include" + " -DSDL_INCLUDE_DIR=${SDL}/include/SDL"; diff --git a/pkgs/applications/video/gnash/default.nix b/pkgs/applications/video/gnash/default.nix index fc773211f69b..e1e2ece8af89 100644 --- a/pkgs/applications/video/gnash/default.nix +++ b/pkgs/applications/video/gnash/default.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { for lib in $libs; do echo -n "$lib " >> macros/libslist done - echo -n "${stdenv.glibc}/lib" >> macros/libslist + echo -n "${stdenv.glibc.out}/lib" >> macros/libslist # Make sure to honor $TMPDIR, for chroot builds. for file in configure gui/Makefile.in Makefile.in |