git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #52705 from jacereda/darwin-sfml-fix

Fix sfml build on Darwin

commitd0f4baf45ce97dde478a330eece4f7a0295e2c5d authorDaiderd Jordan <daiderd@gmail.com> dateThu 3 Jan 2019, 19:47 (8 years ago) parente6797f60bb53c3
2 files changed+9−5
pkgs/development/libraries/sfml/default.nix+8−5 pkgs/top-level/all-packages.nix+1
pkgs/development/libraries/sfml/default.nix+8−5
@@ -1,6 +1,6 @@
11{ stdenv, fetchzip, cmake, libX11, freetype, libjpeg, openal, flac, libvorbis
22, glew, libXrandr, libXrender, udev, xcbutilimage
3−, IOKit, Foundation, AppKit, OpenAL
3+, cf-private, IOKit, Foundation, AppKit, OpenAL
44}:
55
66let
@@ -16,10 +16,13 @@ stdenv.mkDerivation rec {
1616 };
1717
1818 nativeBuildInputs = [ cmake ];
19− buildInputs = [ libX11 freetype libjpeg openal flac libvorbis glew
20− libXrandr libXrender xcbutilimage
21− ] ++ stdenv.lib.optional stdenv.isLinux udev
22− ++ stdenv.lib.optionals stdenv.isDarwin [ IOKit Foundation AppKit OpenAL ];
19+ buildInputs = [ freetype libjpeg openal flac libvorbis glew ]
20+ ++ stdenv.lib.optional stdenv.isLinux udev
21+ ++ stdenv.lib.optionals (!stdenv.isDarwin) [ libX11 libXrandr libXrender xcbutilimage ]
22+ ++ stdenv.lib.optionals stdenv.isDarwin [ IOKit Foundation AppKit OpenAL
23+ # Needed for _NSDefaultRunLoopMode, _OBJC_CLASS_$_NSArray, _OBJC_CLASS_$_NSDate
24+ cf-private
25+ ];
2326
2427 cmakeFlags = [ "-DSFML_INSTALL_PKGCONFIG_FILES=yes"
2528 "-DSFML_MISC_INSTALL_PREFIX=share/SFML"
pkgs/top-level/all-packages.nix+1
@@ -12496,6 +12496,7 @@ in
1249612496
1249712497 sfml = callPackage ../development/libraries/sfml {
1249812498 inherit (darwin.apple_sdk.frameworks) IOKit Foundation AppKit OpenAL;
12499+ inherit (darwin) cf-private;
1249912500 };
1250012501 csfml = callPackage ../development/libraries/csfml { };
1250112502