diff options
Diffstat (limited to 'pkgs/top-level/all-packages.nix')
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 69 |
1 files changed, 13 insertions, 56 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a5e8315b36be0..17913fa63acc1 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -526,8 +526,7 @@ in alacritty = callPackage ../applications/misc/alacritty { inherit (xorg) libXcursor libXxf86vm libXi; - inherit (darwin) cf-private; - inherit (darwin.apple_sdk.frameworks) AppKit CoreFoundation CoreGraphics CoreServices CoreText Foundation OpenGL; + inherit (darwin.apple_sdk.frameworks) AppKit CoreGraphics CoreServices CoreText Foundation OpenGL; }; aldo = callPackage ../applications/radio/aldo { }; @@ -615,7 +614,6 @@ in }; atomicparsley = callPackage ../tools/video/atomicparsley { - inherit (darwin) cf-private; inherit (darwin.apple_sdk.frameworks) Cocoa; }; @@ -1337,7 +1335,6 @@ in codec2 = callPackage ../development/libraries/codec2 { }; contacts = callPackage ../tools/misc/contacts { - inherit (darwin) cf-private; inherit (darwin.apple_sdk.frameworks) Foundation AddressBook; xcbuildHook = xcbuild6Hook; }; @@ -1756,7 +1753,6 @@ in noteshrink = callPackage ../tools/misc/noteshrink { }; noti = callPackage ../tools/misc/noti { - inherit (darwin) cf-private; inherit (darwin.apple_sdk.frameworks) Cocoa; }; @@ -2572,7 +2568,6 @@ in dolphinEmu = callPackage ../misc/emulators/dolphin-emu { }; dolphinEmuMaster = callPackage ../misc/emulators/dolphin-emu/master.nix { inherit (darwin.apple_sdk.frameworks) CoreBluetooth ForceFeedback IOKit OpenGL; - inherit (darwin) cf-private; }; doomseeker = qt5.callPackage ../applications/misc/doomseeker { }; @@ -3997,7 +3992,6 @@ in kexpand = callPackage ../development/tools/kexpand { }; keybase = callPackage ../tools/security/keybase { - inherit (darwin) cf-private; # Reasoning for the inherited apple_sdk.frameworks: # 1. specific compiler errors about: AVFoundation, AudioToolbox, MediaToolbox # 2. the rest are added from here: https://github.com/keybase/client/blob/68bb8c893c5214040d86ea36f2f86fbb7fac8d39/go/chat/attachments/preview_darwin.go#L7 @@ -5313,7 +5307,6 @@ in }; pinentry_mac = callPackage ../tools/security/pinentry/mac.nix { - inherit (darwin) cf-private; inherit (darwin.apple_sdk.frameworks) Cocoa; xcbuildHook = xcbuild6Hook; }; @@ -6589,7 +6582,6 @@ in watchman = callPackage ../development/tools/watchman { inherit (darwin.apple_sdk.frameworks) CoreServices; - CoreFoundation = darwin.cf-private; }; wavefunctioncollapse = callPackage ../tools/graphics/wavefunctioncollapse {}; @@ -8059,7 +8051,6 @@ in cargo-web = callPackage ../development/tools/cargo-web { inherit (darwin.apple_sdk.frameworks) CoreServices Security; - inherit (darwin) cf-private; }; carnix = (callPackage ../build-support/rust/carnix.nix { }).carnix { }; @@ -9241,7 +9232,6 @@ in flow = callPackage ../development/tools/analysis/flow { inherit (darwin.apple_sdk.frameworks) CoreServices; - inherit (darwin) cf-private; }; foreman = callPackage ../tools/system/foreman { }; @@ -10404,7 +10394,6 @@ in vid-stab = if stdenv.isDarwin then null else vid-stab; x265 = if stdenv.isDarwin then null else x265; xavs = if stdenv.isDarwin then null else xavs; - inherit (darwin) cf-private; inherit (darwin.apple_sdk.frameworks) Cocoa CoreServices CoreAudio AVFoundation MediaToolbox VideoDecodeAcceleration; @@ -10432,11 +10421,9 @@ in flite = callPackage ../development/libraries/flite { }; fltk13 = callPackage ../development/libraries/fltk { - inherit (darwin) cf-private; inherit (darwin.apple_sdk.frameworks) Cocoa AGL GLUT; }; fltk14 = callPackage ../development/libraries/fltk/1.4.nix { - inherit (darwin) cf-private; inherit (darwin.apple_sdk.frameworks) Cocoa AGL GLUT; }; fltk = res.fltk13; @@ -10599,7 +10586,6 @@ in glfw = glfw3; glfw2 = callPackage ../development/libraries/glfw/2.x.nix { }; glfw3 = callPackage ../development/libraries/glfw/3.x.nix { - inherit (darwin) cf-private; inherit (darwin.apple_sdk.frameworks) Cocoa Kernel; }; @@ -12075,7 +12061,6 @@ in libuecc = callPackage ../development/libraries/libuecc { }; libui = callPackage ../development/libraries/libui { - inherit (darwin) cf-private; inherit (darwin.apple_sdk.frameworks) Cocoa; }; @@ -12536,12 +12521,10 @@ in openct = callPackage ../development/libraries/openct { }; opencv = callPackage ../development/libraries/opencv { - inherit (darwin) cf-private; inherit (darwin.apple_sdk.frameworks) Cocoa QTKit; }; opencv3 = callPackage ../development/libraries/opencv/3.x.nix { - inherit (darwin) cf-private; inherit (darwin.apple_sdk.frameworks) AVFoundation Cocoa VideoDecodeAcceleration; }; @@ -12550,7 +12533,6 @@ in }; opencv4 = callPackage ../development/libraries/opencv/4.x.nix { - inherit (darwin) cf-private; inherit (darwin.apple_sdk.frameworks) AVFoundation Cocoa VideoDecodeAcceleration; }; @@ -12636,7 +12618,6 @@ in pcg_c = callPackage ../development/libraries/pcg-c { }; pcl = libsForQt5.callPackage ../development/libraries/pcl { - inherit (darwin) cf-private; inherit (darwin.apple_sdk.frameworks) Cocoa AGL OpenGL; }; @@ -12783,7 +12764,7 @@ in # XXX: mariadb doesn't built on fbsd as of nov 2015 mysql = if (!stdenv.isFreeBSD) then mysql else null; - inherit (pkgs.darwin) cf-private libobjc; + inherit (pkgs.darwin) libobjc; inherit (pkgs.darwin.apple_sdk.frameworks) ApplicationServices OpenGL Cocoa AGL; }; @@ -12803,13 +12784,12 @@ in qt56 = recurseIntoAttrs (makeOverridable (import ../development/libraries/qt-5/5.6) { inherit newScope; - inherit stdenv fetchurl fetchpatch makeSetupHook; + inherit stdenv fetchurl fetchpatch makeSetupHook makeWrapper; bison = bison2; # error: too few arguments to function 'int yylex(... inherit cups; harfbuzz = harfbuzzFull; inherit libGL; inherit perl; - inherit (darwin) cf-private; inherit (gst_all_1) gstreamer gst-plugins-base; }); @@ -12818,13 +12798,12 @@ in qt59 = recurseIntoAttrs (makeOverridable (import ../development/libraries/qt-5/5.9) { inherit newScope; - inherit stdenv fetchurl fetchpatch makeSetupHook; + inherit stdenv fetchurl fetchpatch makeSetupHook makeWrapper; bison = bison2; # error: too few arguments to function 'int yylex(... inherit cups; harfbuzz = harfbuzzFull; inherit libGL; inherit perl; - inherit (darwin) cf-private; inherit (gst_all_1) gstreamer gst-plugins-base; inherit gtk3; inherit (gnome3) dconf; @@ -12835,13 +12814,12 @@ in qt511 = recurseIntoAttrs (makeOverridable (import ../development/libraries/qt-5/5.11) { inherit newScope; - inherit stdenv fetchurl fetchFromGitHub makeSetupHook; + inherit stdenv fetchurl fetchFromGitHub makeSetupHook makeWrapper; bison = bison2; # error: too few arguments to function 'int yylex(... inherit cups; harfbuzz = harfbuzzFull; inherit libGL; inherit perl; - inherit (darwin) cf-private; inherit gtk3; inherit (gnome3) dconf; inherit (gst_all_1) gstreamer gst-plugins-base; @@ -12853,13 +12831,12 @@ in qt512 = recurseIntoAttrs (makeOverridable (import ../development/libraries/qt-5/5.12) { inherit newScope; - inherit stdenv fetchurl fetchFromGitHub makeSetupHook; + inherit stdenv fetchurl fetchFromGitHub makeSetupHook makeWrapper; bison = bison2; # error: too few arguments to function 'int yylex(... inherit cups; harfbuzz = harfbuzzFull; inherit libGL; inherit perl; - inherit (darwin) cf-private; inherit gtk3; inherit (gnome3) dconf; inherit (gst_all_1) gstreamer gst-plugins-base; @@ -13119,7 +13096,6 @@ in schroedinger = callPackage ../development/libraries/schroedinger { }; SDL = callPackage ../development/libraries/SDL ({ - inherit (darwin) cf-private; inherit (darwin.apple_sdk.frameworks) OpenGL CoreAudio CoreServices AudioUnit Kernel Cocoa; } // lib.optionalAttrs stdenv.hostPlatform.isAndroid { # libGLU doesn’t work with Android’s SDL @@ -13145,7 +13121,6 @@ in SDL_ttf = callPackage ../development/libraries/SDL_ttf { }; SDL2 = callPackage ../development/libraries/SDL2 { - inherit (darwin) cf-private; inherit (darwin.apple_sdk.frameworks) AudioUnit Cocoa CoreAudio CoreServices ForceFeedback OpenGL; }; @@ -13197,7 +13172,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 { }; @@ -13642,7 +13616,7 @@ in vte-ng = callPackage ../development/libraries/vte/ng.nix { }; vtk = callPackage ../development/libraries/vtk { - inherit (darwin) cf-private libobjc; + inherit (darwin) libobjc; inherit (darwin.apple_sdk.libs) xpc; inherit (darwin.apple_sdk.frameworks) Cocoa CoreServices DiskArbitration IOKit CFNetwork Security ApplicationServices @@ -13758,7 +13732,6 @@ in wxmac = callPackage ../development/libraries/wxwidgets/3.0/mac.nix { inherit (darwin.apple_sdk.frameworks) AGL Cocoa Kernel; inherit (darwin.stubs) setfile rez derez; - inherit (darwin) cf-private; }; wxSVG = callPackage ../development/libraries/wxSVG { @@ -14933,13 +14906,10 @@ in xqilla = callPackage ../development/tools/xqilla { }; - xquartz = callPackage ../servers/x11/xquartz { - inherit (darwin) cf-private; - }; + xquartz = callPackage ../servers/x11/xquartz { }; quartz-wm = callPackage ../servers/x11/quartz-wm { stdenv = clangStdenv; - inherit (darwin) cf-private; inherit (darwin.apple_sdk.frameworks) AppKit Foundation; inherit (darwin.apple_sdk.libs) Xplugin; }; @@ -14949,7 +14919,6 @@ in # have created a cycle. xorg = recurseIntoAttrs ((lib.callPackageWith __splicedPackages ../servers/x11/xorg { }).overrideScope' (lib.callPackageWith __splicedPackages ../servers/x11/xorg/overrides.nix { - inherit (darwin) cf-private; inherit (darwin.apple_sdk.frameworks) ApplicationServices Carbon Cocoa; inherit (darwin.apple_sdk.libs) Xplugin; inherit (buildPackages.darwin) bootstrap_cmds; @@ -17564,7 +17533,6 @@ in imagemagick = null; acl = null; gpm = null; - inherit (darwin) cf-private; inherit (darwin.apple_sdk.frameworks) AppKit GSS ImageIO; }; @@ -17583,7 +17551,6 @@ in imagemagick = null; acl = null; gpm = null; - inherit (darwin) cf-private; inherit (darwin.apple_sdk.frameworks) AppKit GSS ImageIO; }; @@ -17594,7 +17561,6 @@ in })); emacsMacport = callPackage ../applications/editors/emacs/macport.nix { - inherit (darwin) cf-private; inherit (darwin.apple_sdk.frameworks) AppKit Carbon Cocoa IOKit OSAKit Quartz QuartzCore WebKit ImageCaptureCore GSS ImageIO; @@ -18191,7 +18157,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 { @@ -18801,10 +18766,7 @@ in kipi-plugins = libsForQt5.callPackage ../applications/graphics/kipi-plugins { }; kitty = callPackage ../applications/misc/kitty { - harfbuzz = if stdenv.isDarwin then harfbuzz.override { - withCoreText = true; - } else harfbuzz; - inherit (darwin) cf-private; + harfbuzz = harfbuzz.override { withCoreText = stdenv.isDarwin; }; inherit (darwin.apple_sdk.frameworks) Cocoa CoreGraphics Foundation IOKit Kernel OpenGL; }; @@ -20425,7 +20387,7 @@ in syncthing-tray = callPackage ../applications/misc/syncthing-tray { }; synergy = callPackage ../applications/misc/synergy { - inherit (darwin) cf-private; + stdenv = if stdenv.cc.isClang then llvmPackages_5.stdenv else stdenv; inherit (darwin.apple_sdk.frameworks) ApplicationServices Carbon Cocoa CoreServices ScreenSaver; }; @@ -20499,7 +20461,6 @@ in aminal = callPackage ../applications/misc/aminal { inherit (darwin.apple_sdk.frameworks) Carbon Cocoa Kernel; - inherit (darwin) cf-private; }; termite-unwrapped = callPackage ../applications/misc/termite { }; @@ -20696,7 +20657,6 @@ in }; vim = callPackage ../applications/editors/vim { - inherit (darwin) cf-private; inherit (darwin.apple_sdk.frameworks) Carbon Cocoa; }; @@ -20708,7 +20668,7 @@ in vim_configurable = vimUtils.makeCustomizable (callPackage ../applications/editors/vim/configurable.nix { inherit (darwin.apple_sdk.frameworks) CoreServices Cocoa Foundation CoreData; - inherit (darwin) libobjc cf-private; + inherit (darwin) libobjc; gtk2 = if stdenv.isDarwin then gtk2-x11 else gtk2; gtk3 = if stdenv.isDarwin then gtk3-x11 else gtk3; }); @@ -21364,7 +21324,6 @@ in zola = callPackage ../applications/misc/zola { inherit (darwin.apple_sdk.frameworks) CoreServices; - inherit (darwin) cf-private; }; zoom-us = libsForQt59.callPackage ../applications/networking/instant-messengers/zoom-us { }; @@ -21639,7 +21598,7 @@ in garden-of-coloured-lights = callPackage ../games/garden-of-coloured-lights { allegro = allegro4; }; gargoyle = callPackage ../games/gargoyle { - inherit (darwin) cctools cf-private; + inherit (darwin) cctools; }; gav = callPackage ../games/gav { }; @@ -23112,13 +23071,11 @@ in ns-3 = callPackage ../development/libraries/science/networking/ns3 { }; root = callPackage ../applications/science/misc/root { - inherit (darwin) cf-private; inherit (darwin.apple_sdk.frameworks) Cocoa OpenGL; stdenv = if stdenv.cc.isClang then llvmPackages_5.stdenv else stdenv; }; root5 = lowPrio (callPackage ../applications/science/misc/root/5.nix { - inherit (darwin) cf-private; inherit (darwin.apple_sdk.frameworks) Cocoa OpenGL; stdenv = if stdenv.cc.isClang then llvmPackages_5.stdenv else stdenv; }); @@ -23454,7 +23411,7 @@ in jack2 = callPackage ../misc/jackaudio { libopus = libopus.override { withCustomModes = true; }; inherit (darwin.apple_sdk.frameworks) AudioUnit CoreAudio Accelerate; - inherit (darwin) cf-private libobjc; + inherit (darwin) libobjc; }; libjack2 = jack2.override { prefix = "lib"; }; jack2Full = jack2; # TODO: move to aliases.nix |