From 72f2e6dc7b92479ce7bfc116ec0234dd5c5c0e39 Mon Sep 17 00:00:00 2001 From: Daiderd Jordan Date: Wed, 19 Jun 2019 20:33:40 +0200 Subject: [PATCH] sfml: remove cf-private --- pkgs/development/libraries/sfml/default.nix | 7 ++----- pkgs/top-level/all-packages.nix | 1 - 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/pkgs/development/libraries/sfml/default.nix b/pkgs/development/libraries/sfml/default.nix index 8e1b9ae394b..1b043d33ad6 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 -, cf-private, IOKit, Foundation, AppKit, OpenAL +, IOKit, Foundation, AppKit, OpenAL }: let @@ -19,10 +19,7 @@ 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 - # Needed for _NSDefaultRunLoopMode, _OBJC_CLASS_$_NSArray, _OBJC_CLASS_$_NSDate - cf-private - ]; + ++ stdenv.lib.optionals stdenv.isDarwin [ IOKit Foundation AppKit OpenAL ]; 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 12de4ba5eaa..cdcdabba803 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13161,7 +13161,6 @@ in sfml = callPackage ../development/libraries/sfml { inherit (darwin.apple_sdk.frameworks) IOKit Foundation AppKit OpenAL; - inherit (darwin) cf-private; }; csfml = callPackage ../development/libraries/csfml { };