From 1fdbc3097b42e6458b7f29a7aba9141c0e6e0e64 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Thu, 8 Oct 2015 11:23:19 +0200 Subject: [PATCH] alsa-lib: split "dev" output and fix referrers --- pkgs/applications/editors/music/tuxguitar/default.nix | 2 +- pkgs/applications/virtualization/virtualbox/default.nix | 6 +++--- pkgs/development/compilers/openjdk/7.nix | 6 +++--- pkgs/development/libraries/SDL/default.nix | 2 +- pkgs/development/libraries/SDL2/default.nix | 2 +- pkgs/development/libraries/portaudio/default.nix | 2 +- pkgs/games/stepmania/default.nix | 2 +- pkgs/os-specific/linux/alsa-lib/default.nix | 2 ++ pkgs/tools/audio/qastools/default.nix | 2 +- 9 files changed, 14 insertions(+), 12 deletions(-) diff --git a/pkgs/applications/editors/music/tuxguitar/default.nix b/pkgs/applications/editors/music/tuxguitar/default.nix index 768842a3875d..65ea62b33686 100644 --- a/pkgs/applications/editors/music/tuxguitar/default.nix +++ b/pkgs/applications/editors/music/tuxguitar/default.nix @@ -26,7 +26,7 @@ in stdenv.mkDerivation rec { wrapProgram $out/bin/tuxguitar \ --set JAVA "${jdk}/bin/java" \ - --prefix LD_LIBRARY_PATH : "$out/lib/:${swt}/lib:${alsaLib}/lib" \ + --prefix LD_LIBRARY_PATH : "$out/lib/:${swt}/lib:${alsaLib.out}/lib" \ --prefix CLASSPATH : "${swt}/jars/swt.jar:$out/lib/tuxguitar.jar:$out/lib/itext.jar" ''; diff --git a/pkgs/applications/virtualization/virtualbox/default.nix b/pkgs/applications/virtualization/virtualbox/default.nix index 3576923f0026..efb1ceeb0982 100644 --- a/pkgs/applications/virtualization/virtualbox/default.nix +++ b/pkgs/applications/virtualization/virtualbox/default.nix @@ -85,10 +85,10 @@ in stdenv.mkDerivation { ls kBuild/bin/linux.amd64/k* tools/linux.amd64/bin/* | xargs -n 1 patchelf --set-interpreter ${stdenv.glibc.out}/lib/ld-linux-x86-64.so.2 find . -type f -iname '*makefile*' -exec sed -i -e 's/depmod -a/:/g' {} + sed -i -e ' - s@"libdbus-1\.so\.3"@"${dbus}/lib/libdbus-1.so.3"@g - s@"libasound\.so\.2"@"${alsaLib}/lib/libasound.so.2"@g + s@"libdbus-1\.so\.3"@"${dbus.out}/lib/libdbus-1.so.3"@g + s@"libasound\.so\.2"@"${alsaLib.out}/lib/libasound.so.2"@g ${optionalString pulseSupport '' - s@"libpulse\.so\.0"@"${libpulseaudio}/lib/libpulse.so.0"@g + s@"libpulse\.so\.0"@"${libpulseaudio.out}/lib/libpulse.so.0"@g ''} ' src/VBox/Main/xml/Settings.cpp \ src/VBox/Devices/Audio/{alsa,pulse}_stubs.c \ diff --git a/pkgs/development/compilers/openjdk/7.nix b/pkgs/development/compilers/openjdk/7.nix index 19dec917bf82..12d32a134c8e 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 ac895b5113ed..070cf76da6d9 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 7573d1e1cd29..ad4cce30c643 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 46d512814015..5d8c2430ab9f 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; { diff --git a/pkgs/games/stepmania/default.nix b/pkgs/games/stepmania/default.nix index 99bafe95b757..7d83a05bc3bc 100644 --- a/pkgs/games/stepmania/default.nix +++ b/pkgs/games/stepmania/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { postInstall = '' mkdir -p $out/bin echo "#!/bin/sh" > $out/bin/stepmania - echo "export LD_LIBRARY_PATH=$out/stepmania-5.0:${alsaLib}/lib:\$LD_LIBRARY_PATH" >> $out/bin/stepmania + echo "export LD_LIBRARY_PATH=$out/stepmania-5.0:${alsaLib.out}/lib:\$LD_LIBRARY_PATH" >> $out/bin/stepmania echo "exec $out/stepmania-5.0/stepmania" >> $out/bin/stepmania chmod +x $out/bin/stepmania ''; diff --git a/pkgs/os-specific/linux/alsa-lib/default.nix b/pkgs/os-specific/linux/alsa-lib/default.nix index ed72e7011663..8f46bb29c1fb 100644 --- a/pkgs/os-specific/linux/alsa-lib/default.nix +++ b/pkgs/os-specific/linux/alsa-lib/default.nix @@ -25,6 +25,8 @@ stdenv.mkDerivation rec { sed -i -e 's/u_int\([0-9]*\)_t/uint\1_t/g' include/pcm.h ''; + outputs = [ "dev" "out" ]; + crossAttrs = { patchPhase = '' sed -i s/extern/static/g include/iatomic.h diff --git a/pkgs/tools/audio/qastools/default.nix b/pkgs/tools/audio/qastools/default.nix index 920f6913d090..3743b38a2103 100644 --- a/pkgs/tools/audio/qastools/default.nix +++ b/pkgs/tools/audio/qastools/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation { cmakeFlags = [ "-DCMAKE_INSALL_PREFIX=$out" - "-DALSA_INCLUDE=${alsaLib}/include/alsa/version.h" + "-DALSA_INCLUDE=${alsaLib.dev}/include/alsa/version.h" ]; meta = with stdenv.lib; {