diff options
| author | Jorge Acereda <jacereda@gmail.com> | 2019-01-03 16:13:12 +0100 |
|---|---|---|
| committer | Jorge Acereda <jacereda@gmail.com> | 2019-01-03 16:13:12 +0100 |
| commit | 0bb53c3e8a8ed9464e910c381b8e9d74fb415644 (patch) | |
| tree | 745ed50956ca9729d3b17089b1cf9dd1a3f91650 /pkgs | |
| parent | c9677e38be7ec1649324eb66560f3616ea36db0b (diff) | |
| download | nixlib-0bb53c3e8a8ed9464e910c381b8e9d74fb415644.tar nixlib-0bb53c3e8a8ed9464e910c381b8e9d74fb415644.tar.gz nixlib-0bb53c3e8a8ed9464e910c381b8e9d74fb415644.tar.bz2 nixlib-0bb53c3e8a8ed9464e910c381b8e9d74fb415644.tar.lz nixlib-0bb53c3e8a8ed9464e910c381b8e9d74fb415644.tar.xz nixlib-0bb53c3e8a8ed9464e910c381b8e9d74fb415644.tar.zst nixlib-0bb53c3e8a8ed9464e910c381b8e9d74fb415644.zip | |
sfml: comment the cf-private workaround
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/development/libraries/sfml/default.nix | 7 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 1 |
2 files changed, 6 insertions, 2 deletions
diff --git a/pkgs/development/libraries/sfml/default.nix b/pkgs/development/libraries/sfml/default.nix index 435a9e030a0a..ff59bdcdf92e 100644 --- a/pkgs/development/libraries/sfml/default.nix +++ b/pkgs/development/libraries/sfml/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchzip, cmake, libX11, freetype, libjpeg, openal, flac, libvorbis , glew, libXrandr, libXrender, udev, xcbutilimage -, darwin, IOKit, Foundation, AppKit, OpenAL +, cf-private, IOKit, Foundation, AppKit, OpenAL }: let @@ -19,7 +19,10 @@ stdenv.mkDerivation rec { buildInputs = [ freetype libjpeg openal flac libvorbis glew ] ++ stdenv.lib.optional stdenv.isLinux udev ++ stdenv.lib.optionals (!stdenv.isDarwin) [ libX11 libXrandr libXrender xcbutilimage ] - ++ stdenv.lib.optionals stdenv.isDarwin [ IOKit Foundation AppKit OpenAL darwin.cf-private ]; + ++ stdenv.lib.optionals stdenv.isDarwin [ IOKit Foundation AppKit OpenAL + # Needed for _NSDefaultRunLoopMode, _OBJC_CLASS_$_NSArray, _OBJC_CLASS_$_NSDate + cf-private + ]; cmakeFlags = [ "-DSFML_INSTALL_PKGCONFIG_FILES=yes" "-DSFML_MISC_INSTALL_PREFIX=share/SFML" diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e8f8cb564bd9..8ba097478135 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12491,6 +12491,7 @@ in sfml = callPackage ../development/libraries/sfml { inherit (darwin.apple_sdk.frameworks) IOKit Foundation AppKit OpenAL; + inherit (darwin) cf-private; }; csfml = callPackage ../development/libraries/csfml { }; |