git.iko.soy/typeable/nixpkgs
on master help sign in
sfml: comment the cf-private workaround
commit0bb53c3e8a8ed9464e910c381b8e9d74fb415644 authorJorge Acereda <jacereda@gmail.com> dateThu 3 Jan 2019, 16:13 (8 years ago) parentc9677e3
2 files changed+6−2
pkgs/development/libraries/sfml/default.nix+5−2 pkgs/top-level/all-packages.nix+1
pkgs/development/libraries/sfml/default.nix+5−2
@@ -1,6 +1,6 @@
11{ stdenv, fetchzip, cmake, libX11, freetype, libjpeg, openal, flac, libvorbis
22, glew, libXrandr, libXrender, udev, xcbutilimage
3−, darwin, IOKit, Foundation, AppKit, OpenAL
3+, cf-private, IOKit, Foundation, AppKit, OpenAL
44}:
55
66let
@@ -19,7 +19,10 @@ stdenv.mkDerivation rec {
1919 buildInputs = [ freetype libjpeg openal flac libvorbis glew ]
2020 ++ stdenv.lib.optional stdenv.isLinux udev
2121 ++ stdenv.lib.optionals (!stdenv.isDarwin) [ libX11 libXrandr libXrender xcbutilimage ]
22− ++ stdenv.lib.optionals stdenv.isDarwin [ IOKit Foundation AppKit OpenAL darwin.cf-private ];
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
@@ -12491,6 +12491,7 @@ in
1249112491
1249212492 sfml = callPackage ../development/libraries/sfml {
1249312493 inherit (darwin.apple_sdk.frameworks) IOKit Foundation AppKit OpenAL;
12494+ inherit (darwin) cf-private;
1249412495 };
1249512496 csfml = callPackage ../development/libraries/csfml { };
1249612497