From bea56ef8ba568d593cd8e8ffd4962c2358732bf4 Mon Sep 17 00:00:00 2001 From: Daiderd Jordan Date: Wed, 19 Jun 2019 22:19:04 +0200 Subject: [PATCH] gimp: remove cf-private --- pkgs/applications/graphics/gimp/default.nix | 6 ++---- pkgs/top-level/all-packages.nix | 1 - 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/graphics/gimp/default.nix b/pkgs/applications/graphics/gimp/default.nix index a2a6fe3c14f..16b520fa7ed 100644 --- a/pkgs/applications/graphics/gimp/default.nix +++ b/pkgs/applications/graphics/gimp/default.nix @@ -3,7 +3,7 @@ , libmng, librsvg, libwmf, zlib, libzip, ghostscript, aalib, shared-mime-info , python2Packages, libexif, gettext, xorg, glib-networking, libmypaint, gexiv2 , harfbuzz, mypaint-brushes, libwebp, libheif, libgudev, openexr -, AppKit, Cocoa, gtk-mac-integration-gtk2, cf-private }: +, AppKit, Cocoa, gtk-mac-integration-gtk2 }: let inherit (python2Packages) pygtk wrapPython python; @@ -24,9 +24,7 @@ in stdenv.mkDerivation rec { libmng librsvg libwmf zlib libzip ghostscript aalib shared-mime-info libwebp libheif python pygtk libexif xorg.libXpm glib-networking libmypaint mypaint-brushes ] ++ stdenv.lib.optionals stdenv.isDarwin [ - # cf-private is needed to get some things not in swift-corefoundation. - # For instance _OBJC_CLASS_$_NSArray is missing. - AppKit Cocoa gtk-mac-integration-gtk2 cf-private + AppKit Cocoa gtk-mac-integration-gtk2 ] ++ stdenv.lib.optionals stdenv.isLinux [ libgudev ]; pythonPath = [ pygtk ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index afe8f6c6119..72fa652f17e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -18119,7 +18119,6 @@ in gegl = gegl_0_4; lcms = lcms2; inherit (darwin.apple_sdk.frameworks) AppKit Cocoa; - inherit (darwin) cf-private; }; gimp-with-plugins = callPackage ../applications/graphics/gimp/wrapper.nix {