alsa-lib: split "dev" output and fix referrers
This commit is contained in:
parent
888183ffd6
commit
1fdbc3097b
|
@ -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"
|
||||
'';
|
||||
|
||||
|
|
|
@ -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 \
|
||||
|
|
|
@ -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="
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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; {
|
||||
|
|
|
@ -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
|
||||
'';
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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; {
|
||||
|
|
Loading…
Reference in a new issue