Clone of https://github.com/NixOS/nixpkgs.git (to stress-test knotserver)

sfml: comment the cf-private workaround

+6 -2
+5 -2
pkgs/development/libraries/sfml/default.nix
··· 1 1 { stdenv, fetchzip, cmake, libX11, freetype, libjpeg, openal, flac, libvorbis 2 2 , glew, libXrandr, libXrender, udev, xcbutilimage 3 - , darwin, IOKit, Foundation, AppKit, OpenAL 3 + , cf-private, IOKit, Foundation, AppKit, OpenAL 4 4 }: 5 5 6 6 let ··· 19 19 buildInputs = [ freetype libjpeg openal flac libvorbis glew ] 20 20 ++ stdenv.lib.optional stdenv.isLinux udev 21 21 ++ 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 + ]; 23 26 24 27 cmakeFlags = [ "-DSFML_INSTALL_PKGCONFIG_FILES=yes" 25 28 "-DSFML_MISC_INSTALL_PREFIX=share/SFML"
+1
pkgs/top-level/all-packages.nix
··· 12491 12491 12492 12492 sfml = callPackage ../development/libraries/sfml { 12493 12493 inherit (darwin.apple_sdk.frameworks) IOKit Foundation AppKit OpenAL; 12494 + inherit (darwin) cf-private; 12494 12495 }; 12495 12496 csfml = callPackage ../development/libraries/csfml { }; 12496 12497