diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2015-10-08 11:23:19 +0200 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2015-10-13 20:18:55 +0200 |
| commit | 1fdbc3097b42e6458b7f29a7aba9141c0e6e0e64 (patch) | |
| tree | b534ed0d718a50abc16444bee83d35055552d667 /pkgs/development | |
| parent | 888183ffd6a1614971ab5a684e5e4d6a397fc7ad (diff) | |
| download | nixpkgs-1fdbc3097b42e6458b7f29a7aba9141c0e6e0e64.tar nixpkgs-1fdbc3097b42e6458b7f29a7aba9141c0e6e0e64.tar.gz nixpkgs-1fdbc3097b42e6458b7f29a7aba9141c0e6e0e64.tar.bz2 nixpkgs-1fdbc3097b42e6458b7f29a7aba9141c0e6e0e64.tar.lz nixpkgs-1fdbc3097b42e6458b7f29a7aba9141c0e6e0e64.tar.xz nixpkgs-1fdbc3097b42e6458b7f29a7aba9141c0e6e0e64.tar.zst nixpkgs-1fdbc3097b42e6458b7f29a7aba9141c0e6e0e64.zip | |
alsa-lib: split "dev" output and fix referrers
Diffstat (limited to 'pkgs/development')
| -rw-r--r-- | pkgs/development/compilers/openjdk/7.nix | 6 | ||||
| -rw-r--r-- | pkgs/development/libraries/SDL/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/development/libraries/SDL2/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/development/libraries/portaudio/default.nix | 2 |
4 files changed, 6 insertions, 6 deletions
diff --git a/pkgs/development/compilers/openjdk/7.nix b/pkgs/development/compilers/openjdk/7.nix index 19dec917bf8..12d32a134c8 100644 --- a/pkgs/development/compilers/openjdk/7.nix +++ b/pkgs/development/compilers/openjdk/7.nix @@ -107,9 +107,9 @@ let makeFlags = [ "SORT=${coreutils}/bin/sort" - "ALSA_INCLUDE=${alsaLib}/include/alsa/version.h" - "FREETYPE_HEADERS_PATH=${freetype}/include" - "FREETYPE_LIB_PATH=${freetype}/lib" + "ALSA_INCLUDE=${alsaLib.dev}/include/alsa/version.h" + "FREETYPE_HEADERS_PATH=${freetype.dev}/include" + "FREETYPE_LIB_PATH=${freetype.out}/lib" "MILESTONE=${update}" "BUILD_NUMBER=b${build}" "USRBIN_PATH=" diff --git a/pkgs/development/libraries/SDL/default.nix b/pkgs/development/libraries/SDL/default.nix index ac895b5113e..070cf76da6d 100644 --- a/pkgs/development/libraries/SDL/default.nix +++ b/pkgs/development/libraries/SDL/default.nix @@ -55,7 +55,7 @@ stdenv.mkDerivation rec { "--disable-osmesa-shared" ] ++ stdenv.lib.optionals (stdenv ? cross) ([ "--without-x" - ] ++ stdenv.lib.optional alsaSupport "--with-alsa-prefix=${alsaLib}/lib"); + ] ++ stdenv.lib.optional alsaSupport "--with-alsa-prefix=${alsaLib.out}/lib"); # Fix a build failure on OS X Mavericks # Ticket: https://bugzilla.libsdl.org/show_bug.cgi?id=2085 diff --git a/pkgs/development/libraries/SDL2/default.nix b/pkgs/development/libraries/SDL2/default.nix index 7573d1e1cd2..ad4cce30c64 100644 --- a/pkgs/development/libraries/SDL2/default.nix +++ b/pkgs/development/libraries/SDL2/default.nix @@ -18,7 +18,7 @@ let configureFlagsFun = attrs: '' --disable-oss --disable-x11-shared --disable-pulseaudio-shared --disable-alsa-shared - ${if alsaSupport then "--with-alsa-prefix=${attrs.alsaLib}/lib" else ""} + ${if alsaSupport then "--with-alsa-prefix=${attrs.alsaLib.out}/lib" else ""} ${if (!x11Support) then "--without-x" else ""} ''; in diff --git a/pkgs/development/libraries/portaudio/default.nix b/pkgs/development/libraries/portaudio/default.nix index 46d51281401..5d8c2430ab9 100644 --- a/pkgs/development/libraries/portaudio/default.nix +++ b/pkgs/development/libraries/portaudio/default.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { make install # fixup .pc file to find alsa library - sed -i "s|-lasound|-L${alsaLib}/lib -lasound|" "$out/lib/pkgconfig/"*.pc + sed -i "s|-lasound|-L${alsaLib.out}/lib -lasound|" "$out/lib/pkgconfig/"*.pc ''; meta = with stdenv.lib; { |