public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #36377 from oxij/pkgs/fix-pulseaudio-references

Browse Source 
tree-wide: fix pulseaudio references; fix SDL expressions
This commit is contained in:
Michael Raskin
2018-03-06 19:56:36 +00:00
committed by GitHub
parent c8664a2640 19130ebc5d
commit b49ef26eca
4 changed files with 120 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files

72
pkgs/development/libraries/SDL2/default.nix
View File

@@ -11,19 +11,23 @@
, libiconv
}:
# OSS is no longer supported, for it's much crappier than ALSA and
# PulseAudio.
assert !stdenv.isDarwin -> alsaSupport || pulseaudioSupport;
# NOTE: When editing this expression see if the same change applies to
# SDL expression too
assert openglSupport -> (stdenv.isDarwin || libGL != null && x11Support);
with lib;
assert !stdenv.isDarwin -> alsaSupport || pulseaudioSupport;
assert openglSupport -> (stdenv.isDarwin || x11Support && libGL != null);
let
configureFlagsFun = attrs: [
"--disable-oss" "--disable-x11-shared" "--disable-wayland-shared"
"--disable-pulseaudio-shared" "--disable-alsa-shared"
] ++ lib.optional alsaSupport "--with-alsa-prefix=${attrs.alsaLib.out}/lib"
++ lib.optional (!x11Support) "--without-x";
"--disable-oss"
] ++ optional (!x11Support) "--without-x"
++ optional alsaSupport "--with-alsa-prefix=${attrs.alsaLib.out}/lib";
in
stdenv.mkDerivation rec {
name = "SDL2-${version}";
version = "2.0.8";
@@ -34,35 +38,29 @@ stdenv.mkDerivation rec {
};
outputs = [ "out" "dev" ];
outputBin = "dev"; # sdl-config
patches = [ ./find-headers.patch ];
nativeBuildInputs = [ pkgconfig ];
# Since `libpulse*.la' contain `-lgdbm', PulseAudio must be propagated.
propagatedBuildInputs = lib.optionals x11Support [ libICE libXi libXScrnSaver libXcursor libXinerama libXext libXrandr libXxf86vm ] ++
lib.optionals waylandSupport [ wayland wayland-protocols libxkbcommon ] ++
lib.optional pulseaudioSupport libpulseaudio
++ [ libiconv ];
propagatedBuildInputs = [ libiconv ]
++ optional dbusSupport dbus
++ optional udevSupport udev
++ optionals x11Support [ libICE libXi libXScrnSaver libXcursor libXinerama libXext libXrandr libXxf86vm ]
++ optionals waylandSupport [ wayland wayland-protocols libxkbcommon ]
++ optional alsaSupport alsaLib
++ optional pulseaudioSupport libpulseaudio;
buildInputs = [ audiofile ] ++
lib.optional openglSupport libGL ++
lib.optional alsaSupport alsaLib ++
lib.optional dbusSupport dbus ++
lib.optional udevSupport udev ++
lib.optional ibusSupport ibus ++
lib.optionals stdenv.isDarwin [ AudioUnit Cocoa CoreAudio CoreServices ForceFeedback OpenGL ];
# https://bugzilla.libsdl.org/show_bug.cgi?id=1431
dontDisableStatic = true;
buildInputs = [ audiofile ]
++ optional openglSupport libGL
++ optional ibusSupport ibus
++ optionals stdenv.isDarwin [ AudioUnit Cocoa CoreAudio CoreServices ForceFeedback OpenGL ];
# /build/SDL2-2.0.7/src/video/wayland/SDL_waylandevents.c:41:10: fatal error:
# pointer-constraints-unstable-v1-client-protocol.h: No such file or directory
enableParallelBuilding = false;
# XXX: By default, SDL wants to dlopen() PulseAudio, in which case
# we must arrange to add it to its RPATH; however, `patchelf' seems
# to fail at doing this, hence `--disable-pulseaudio-shared'.
configureFlags = configureFlagsFun { inherit alsaLib; };
crossAttrs = {
@@ -75,6 +73,28 @@ stdenv.mkDerivation rec {
moveToOutput bin/sdl2-config "$dev"
'';
# SDL is weird in that instead of just dynamically linking with
# libraries when you `--enable-*` (or when `configure` finds) them
# it `dlopen`s them at runtime. In principle, this means it can
# ignore any missing optional dependencies like alsa, pulseaudio,
# some x11 libs, wayland, etc if they are missing on the system
# and/or work with wide array of versions of said libraries. In
# nixpkgs, however, we don't need any of that. Moreover, since we
# don't have a global ld-cache we have to stuff all the propagated
# libraries into rpath by hand or else some applications that use
# SDL API that requires said libraries will fail to start.
#
# You can grep SDL sources with `grep -rE 'SDL_(NAME|.*_SYM)'` to
# confirm that they actually use most of the `propagatedBuildInputs`
# from above in this way. This is pretty weird.
postFixup = ''
for lib in $out/lib/*.so* ; do
if [[ -L "$lib" ]]; then
patchelf --set-rpath "$(patchelf --print-rpath $lib):${lib.makeLibraryPath propagatedBuildInputs}" "$lib"
fi
done
'';
setupHook = ./setup-hook.sh;
passthru = { inherit openglSupport; };