nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-29 10:23:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #63381 from LnL7/darwin-frameworks

Browse Source 
darwin-frameworks: remove CF references
This commit is contained in:
Daiderd Jordan 2019-07-03 22:40:28 +02:00 committed by GitHub
commit 10f3980f95
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
69 changed files with 222 additions and 469 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkgs/applications/editors/emacs/25.nix
View File

@ -1,7 +1,7 @@
{ stdenv, lib, fetchurl, ncurses, xlibsWrapper, libXaw, libXpm, Xaw3d
, pkgconfig, gettext, libXft, dbus, libpng, libjpeg, libungif
, libtiff, librsvg, gconf, libxml2, imagemagick, gnutls, libselinux
, alsaLib, cairo, acl, gpm, cf-private, AppKit, GSS, ImageIO
, alsaLib, cairo, acl, gpm, AppKit, GSS, ImageIO
, withX ? !stdenv.isDarwin
, withGTK2 ? false, gtk2 ? null
, withGTK3 ? true, gtk3 ? null, gsettings-desktop-schemas ? null
@ -62,11 +62,7 @@ stdenv.mkDerivation rec {
++ lib.optionals (withX && withGTK3) [ gtk3 gsettings-desktop-schemas ]
++ lib.optional (stdenv.isDarwin && withX) cairo
++ lib.optionals (withX && withXwidgets) [ webkitgtk24x-gtk3 glib-networking ]
++ lib.optionals stdenv.isDarwin [
AppKit GSS ImageIO
# Needed for CFNotificationCenterAddObserver symbols.
cf-private
];
++ lib.optionals stdenv.isDarwin [ AppKit GSS ImageIO ];
hardeningDisable = [ "format" ];

8
pkgs/applications/editors/emacs/default.nix
View File

@ -1,7 +1,7 @@
{ stdenv, lib, fetchurl, ncurses, xlibsWrapper, libXaw, libXpm
, Xaw3d, libXcursor, pkgconfig, gettext, libXft, dbus, libpng, libjpeg, libungif
, libtiff, librsvg, gconf, libxml2, imagemagick, gnutls, libselinux
, alsaLib, cairo, acl, gpm, cf-private, AppKit, GSS, ImageIO, m17n_lib, libotf
, alsaLib, cairo, acl, gpm, AppKit, GSS, ImageIO, m17n_lib, libotf
, systemd ? null
, withX ? !stdenv.isDarwin
, withNS ? stdenv.isDarwin
@ -67,11 +67,7 @@ stdenv.mkDerivation rec {
++ lib.optionals (withX && withGTK3) [ gtk3-x11 gsettings-desktop-schemas ]
++ lib.optional (stdenv.isDarwin && withX) cairo
++ lib.optionals (withX && withXwidgets) [ webkitgtk ]
++ lib.optionals withNS [
AppKit GSS ImageIO
# Needed for CFNotificationCenterAddObserver symbols.
cf-private
];
++ lib.optionals withNS [ AppKit GSS ImageIO ];
hardeningDisable = [ "format" ];

4
pkgs/applications/editors/emacs/macport.nix
View File

@ -1,5 +1,5 @@
{ stdenv, fetchurl, ncurses, pkgconfig, texinfo, libxml2, gnutls, gettext, autoconf, automake
, cf-private, AppKit, Carbon, Cocoa, IOKit, OSAKit, Quartz, QuartzCore, WebKit
, AppKit, Carbon, Cocoa, IOKit, OSAKit, Quartz, QuartzCore, WebKit
, ImageCaptureCore, GSS, ImageIO # These may be optional
}:
@ -33,8 +33,6 @@ stdenv.mkDerivation rec {
buildInputs = [ ncurses libxml2 gnutls texinfo gettext
AppKit Carbon Cocoa IOKit OSAKit Quartz QuartzCore WebKit
ImageCaptureCore GSS ImageIO # may be optional
# Needed for CFNotificationCenterAddObserver symbols.
cf-private
];
postUnpack = ''

4
pkgs/applications/editors/vim/configurable.nix
View File

@ -10,7 +10,7 @@
, runtimeShell
# apple frameworks
, CoreServices, CoreData, Cocoa, Foundation, libobjc, cf-private
, CoreServices, CoreData, Cocoa, Foundation, libobjc
, features ? "huge" # One of tiny, small, normal, big or huge
, wrapPythonDrv ? false
@ -132,7 +132,7 @@ in stdenv.mkDerivation rec {
libXmu glib libICE ]
++ stdenv.lib.optional (guiSupport == "gtk2") gtk2-x11
++ stdenv.lib.optional (guiSupport == "gtk3") gtk3-x11
++ stdenv.lib.optionals darwinSupport [ CoreServices CoreData Cocoa Foundation libobjc cf-private ]
++ stdenv.lib.optionals darwinSupport [ CoreServices CoreData Cocoa Foundation libobjc ]
++ stdenv.lib.optional luaSupport lua
++ stdenv.lib.optional pythonSupport python
++ stdenv.lib.optional tclSupport tcl

8
pkgs/applications/editors/vim/default.nix
View File

@ -6,7 +6,7 @@
sha256 = "18ifhv5q9prd175q3vxbqf6qyvkk6bc7d2lhqdk0q78i68kv9y0c";
}
# apple frameworks
, cf-private, Carbon, Cocoa
, Carbon, Cocoa
}:
let
@ -19,11 +19,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ gettext pkgconfig ];
buildInputs = [ ncurses ]
++ stdenv.lib.optionals stdenv.hostPlatform.isDarwin [
Carbon Cocoa
# Needed for OBJC_CLASS_$_NSArray symbols.
cf-private
];
++ stdenv.lib.optionals stdenv.hostPlatform.isDarwin [ Carbon Cocoa ];
configureFlags = [
"--enable-multibyte"

6
pkgs/applications/graphics/gimp/default.nix
View File

@ -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 ];

8
pkgs/applications/misc/alacritty/default.nix
View File

@ -24,9 +24,7 @@
wayland,
# Darwin Frameworks
cf-private,
AppKit,
CoreFoundation,
CoreGraphics,
CoreServices,
CoreText,
@ -74,11 +72,7 @@ in buildRustPackage rec {
];
buildInputs = rpathLibs
++ lib.optionals stdenv.isDarwin [
AppKit CoreFoundation CoreGraphics CoreServices CoreText Foundation OpenGL
# Needed for CFURLResourceIsReachable symbols.
cf-private
];
++ lib.optionals stdenv.isDarwin [ AppKit CoreGraphics CoreServices CoreText Foundation OpenGL ];
outputs = [ "out" "terminfo" ];

8
pkgs/applications/misc/aminal/default.nix
View File

@ -2,7 +2,6 @@
, Carbon
, Cocoa
, Kernel
, cf-private
, fetchFromGitHub
, lib
, mesa_glu
@ -25,12 +24,7 @@ buildGoPackage rec {
xorg.libXinerama
xorg.libXrandr
xorg.libXxf86vm
] ++ lib.optionals stdenv.isDarwin [
Carbon
Cocoa
Kernel
cf-private /* Needed for NSDefaultRunLoopMode */
];
] ++ lib.optionals stdenv.isDarwin [ Carbon Cocoa Kernel ];
src = fetchFromGitHub {
owner = "liamg";

2
pkgs/applications/misc/kitty/default.nix
View File

@ -9,7 +9,6 @@
IOKit,
Kernel,
OpenGL,
cf-private,
libicns,
libpng,
librsvg,
@ -40,7 +39,6 @@ buildPythonApplication rec {
IOKit
Kernel
OpenGL
cf-private
libpng
python3
zlib

4
pkgs/applications/misc/synergy/default.nix
View File

@ -1,5 +1,5 @@
{ stdenv, lib, fetchFromGitHub, fetchpatch, fetchurl, cmake, xlibsWrapper
, ApplicationServices, Carbon, Cocoa, CoreServices, ScreenSaver, cf-private
, ApplicationServices, Carbon, Cocoa, CoreServices, ScreenSaver
, libX11, libXi, libXtst, libXrandr, xinput, curl, openssl, unzip }:
stdenv.mkDerivation rec {
@ -64,7 +64,7 @@ stdenv.mkDerivation rec {
buildInputs = [
cmake curl openssl
] ++ lib.optionals stdenv.isDarwin [
ApplicationServices Carbon Cocoa CoreServices ScreenSaver cf-private
ApplicationServices Carbon Cocoa CoreServices ScreenSaver
] ++ lib.optionals stdenv.isLinux [ xlibsWrapper libX11 libXi libXtst libXrandr xinput ];
installPhase = ''

5
pkgs/applications/misc/zola/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, rustPlatform, cmake, pkgconfig, openssl, CoreServices, cf-private }:
{ stdenv, fetchFromGitHub, rustPlatform, cmake, pkgconfig, openssl, CoreServices }:
rustPlatform.buildRustPackage rec {
pname = "zola";
@ -14,7 +14,8 @@ rustPlatform.buildRustPackage rec {
cargoSha256 = "1brmlg6nqyls1v62z0fg0km150q9m7h71wy67lidcnw76icmqr24";
nativeBuildInputs = [ cmake pkgconfig ];
buildInputs = [ openssl ] ++ stdenv.lib.optionals stdenv.isDarwin [ CoreServices cf-private ];
buildInputs = [ openssl ]
++ stdenv.lib.optional stdenv.isDarwin CoreServices;
postInstall = ''
install -D -m 444 completions/zola.bash \

4
pkgs/applications/science/misc/root/5.nix
View File

@ -1,6 +1,6 @@
{ stdenv, fetchurl, fetchpatch, cmake, pcre, pkgconfig, python2
, libX11, libXpm, libXft, libXext, libGLU_combined, zlib, libxml2, lzma, gsl_1
, Cocoa, OpenGL, cf-private, noSplash ? false }:
, Cocoa, OpenGL, noSplash ? false }:
stdenv.mkDerivation rec {
name = "root-${version}";
@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ cmake pcre python2 zlib libxml2 lzma gsl_1 ]
++ stdenv.lib.optionals (!stdenv.isDarwin) [ libX11 libXpm libXft libXext libGLU_combined ]
++ stdenv.lib.optionals (stdenv.isDarwin) [ Cocoa OpenGL cf-private ]
++ stdenv.lib.optionals (stdenv.isDarwin) [ Cocoa OpenGL ]
;
patches = [

4
pkgs/applications/science/misc/root/default.nix
View File

@ -1,6 +1,6 @@
{ stdenv, fetchurl, cmake, pcre, pkgconfig, python2
, libX11, libXpm, libXft, libXext, libGLU_combined, zlib, libxml2, lz4, lzma, gsl, xxHash
, Cocoa, OpenGL, cf-private, noSplash ? false }:
, Cocoa, OpenGL, noSplash ? false }:
stdenv.mkDerivation rec {
name = "root-${version}";
@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ cmake pcre python2 zlib libxml2 lz4 lzma gsl xxHash ]
++ stdenv.lib.optionals (!stdenv.isDarwin) [ libX11 libXpm libXft libXext libGLU_combined ]
++ stdenv.lib.optionals (stdenv.isDarwin) [ Cocoa OpenGL cf-private ]
++ stdenv.lib.optionals (stdenv.isDarwin) [ Cocoa OpenGL ]
;
patches = [

2
pkgs/development/compilers/llvm/4/lldb.nix
View File

@ -32,7 +32,7 @@ stdenv.mkDerivation {
nativeBuildInputs = [ cmake python which swig ];
buildInputs = [ ncurses zlib libedit libxml2 llvm ]
++ stdenv.lib.optionals stdenv.isDarwin [ darwin.libobjc darwin.apple_sdk.libs.xpc darwin.apple_sdk.frameworks.Foundation darwin.bootstrap_cmds darwin.apple_sdk.frameworks.Carbon darwin.apple_sdk.frameworks.Cocoa darwin.cf-private ];
++ stdenv.lib.optionals stdenv.isDarwin [ darwin.libobjc darwin.apple_sdk.libs.xpc darwin.apple_sdk.frameworks.Foundation darwin.bootstrap_cmds darwin.apple_sdk.frameworks.Carbon darwin.apple_sdk.frameworks.Cocoa ];
CXXFLAGS = "-fno-rtti";
hardeningDisable = [ "format" ];

2
pkgs/development/compilers/llvm/5/lldb.nix
View File

@ -31,7 +31,7 @@ stdenv.mkDerivation {
nativeBuildInputs = [ cmake python which swig ];
buildInputs = [ ncurses zlib libedit libxml2 llvm ]
++ stdenv.lib.optionals stdenv.isDarwin [ darwin.libobjc darwin.apple_sdk.libs.xpc darwin.apple_sdk.frameworks.Foundation darwin.bootstrap_cmds darwin.apple_sdk.frameworks.Carbon darwin.apple_sdk.frameworks.Cocoa darwin.cf-private ];
++ stdenv.lib.optionals stdenv.isDarwin [ darwin.libobjc darwin.apple_sdk.libs.xpc darwin.apple_sdk.frameworks.Foundation darwin.bootstrap_cmds darwin.apple_sdk.frameworks.Carbon darwin.apple_sdk.frameworks.Cocoa ];
CXXFLAGS = "-fno-rtti";
hardeningDisable = [ "format" ];

2
pkgs/development/compilers/llvm/6/lldb.nix
View File

@ -31,7 +31,7 @@ stdenv.mkDerivation {
nativeBuildInputs = [ cmake python which swig ];
buildInputs = [ ncurses zlib libedit libxml2 llvm ]
++ stdenv.lib.optionals stdenv.isDarwin [ darwin.libobjc darwin.apple_sdk.libs.xpc darwin.apple_sdk.frameworks.Foundation darwin.bootstrap_cmds darwin.apple_sdk.frameworks.Carbon darwin.apple_sdk.frameworks.Cocoa darwin.cf-private ];
++ stdenv.lib.optionals stdenv.isDarwin [ darwin.libobjc darwin.apple_sdk.libs.xpc darwin.apple_sdk.frameworks.Foundation darwin.bootstrap_cmds darwin.apple_sdk.frameworks.Carbon darwin.apple_sdk.frameworks.Cocoa ];
CXXFLAGS = "-fno-rtti";
hardeningDisable = [ "format" ];

23
pkgs/development/compilers/llvm/7/lldb.nix
View File

@ -9,6 +9,7 @@
, libxml2
, llvm
, clang-unwrapped
, perl
, python
, version
, darwin
@ -19,6 +20,11 @@ stdenv.mkDerivation {
src = fetch "lldb" "0klsscg1sczc4nw2l53xggi969k361cng2sjjrfp3bv4g5x14s4v";
nativeBuildInputs = [ cmake perl python which swig ];
buildInputs = [ ncurses zlib libedit libxml2 llvm ]
++ stdenv.lib.optionals stdenv.isDarwin [ darwin.libobjc darwin.apple_sdk.libs.xpc darwin.apple_sdk.frameworks.Foundation darwin.bootstrap_cmds darwin.apple_sdk.frameworks.Carbon darwin.apple_sdk.frameworks.Cocoa ];
postPatch = ''
# Fix up various paths that assume llvm and clang are installed in the same place
sed -i 's,".*ClangConfig.cmake","${clang-unwrapped}/lib/cmake/clang/ClangConfig.cmake",' \
@ -30,22 +36,21 @@ stdenv.mkDerivation {
sed -i -e 's,message(SEND_ERROR "Cannot find debugserver on system."),,' \
-e 's,string(STRIP ''${XCODE_DEV_DIR} XCODE_DEV_DIR),,' \
tools/debugserver/source/CMakeLists.txt
# Fix /usr/bin references for sandboxed builds.
patchShebangs scripts
'';
nativeBuildInputs = [ cmake python which swig ];
buildInputs = [ ncurses zlib libedit libxml2 llvm ]
++ stdenv.lib.optionals stdenv.isDarwin [ darwin.libobjc darwin.apple_sdk.libs.xpc darwin.apple_sdk.frameworks.Foundation darwin.bootstrap_cmds darwin.apple_sdk.frameworks.Carbon darwin.apple_sdk.frameworks.Cocoa darwin.cf-private ];
CXXFLAGS = "-fno-rtti";
hardeningDisable = [ "format" ];
NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.cc.isClang "-I${libxml2.dev}/include/libxml2";
cmakeFlags = [
"-DLLDB_CODESIGN_IDENTITY=" # codesigning makes nondeterministic
"-DSKIP_DEBUGSERVER=ON"
];
CXXFLAGS = "-fno-rtti";
hardeningDisable = [ "format" ];
NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.cc.isClang "-I${libxml2.dev}/include/libxml2";
enableParallelBuilding = true;
postInstall = ''

2
pkgs/development/compilers/llvm/8/lldb.nix
View File

@ -31,7 +31,7 @@ stdenv.mkDerivation {
nativeBuildInputs = [ cmake python which swig ];
buildInputs = [ ncurses zlib libedit libxml2 llvm ]
++ stdenv.lib.optionals stdenv.isDarwin [ darwin.libobjc darwin.apple_sdk.libs.xpc darwin.apple_sdk.frameworks.Foundation darwin.bootstrap_cmds darwin.apple_sdk.frameworks.Carbon darwin.apple_sdk.frameworks.Cocoa darwin.cf-private ];
++ stdenv.lib.optionals stdenv.isDarwin [ darwin.libobjc darwin.apple_sdk.libs.xpc darwin.apple_sdk.frameworks.Foundation darwin.bootstrap_cmds darwin.apple_sdk.frameworks.Carbon darwin.apple_sdk.frameworks.Cocoa ];
CXXFLAGS = "-fno-rtti";
hardeningDisable = [ "format" ];

7
pkgs/development/libraries/SDL/default.nix
View File

@ -6,7 +6,6 @@
, libXext, libICE, libXrandr
, pulseaudioSupport ? config.pulseaudio or stdenv.isLinux && !stdenv.hostPlatform.isAndroid, libpulseaudio
, OpenGL, CoreAudio, CoreServices, AudioUnit, Kernel, Cocoa
, cf-private
}:
# NOTE: When editing this expression see if the same change applies to
@ -41,11 +40,7 @@ stdenv.mkDerivation rec {
buildInputs = [ ]
++ optional (!stdenv.hostPlatform.isMinGW && alsaSupport) audiofile
++ optionals stdenv.isDarwin [
AudioUnit CoreAudio CoreServices Kernel OpenGL
# Needed for NSDefaultRunLoopMode symbols.
cf-private
];
++ optionals stdenv.isDarwin [ AudioUnit CoreAudio CoreServices Kernel OpenGL ];
configureFlags = [
"--disable-oss"

8
pkgs/development/libraries/SDL2/default.nix
View File

@ -14,7 +14,7 @@
, pulseaudioSupport ? config.pulseaudio or stdenv.isLinux && !stdenv.hostPlatform.isAndroid
, libpulseaudio
, AudioUnit, Cocoa, CoreAudio, CoreServices, ForceFeedback, OpenGL
, audiofile, cf-private, libiconv
, audiofile, libiconv
}:
# NOTE: When editing this expression see if the same change applies to
@ -58,11 +58,7 @@ stdenv.mkDerivation rec {
++ dlopenBuildInputs
++ optional ibusSupport ibus
++ optional fcitxSupport fcitx
++ optionals stdenv.isDarwin [
AudioUnit Cocoa CoreAudio CoreServices ForceFeedback OpenGL
# Needed for NSDefaultRunLoopMode symbols.
cf-private
];
++ optionals stdenv.isDarwin [ AudioUnit Cocoa CoreAudio CoreServices ForceFeedback OpenGL ];
enableParallelBuilding = true;

12
pkgs/development/libraries/ffmpeg-full/default.nix
View File

@ -139,7 +139,7 @@
* Darwin frameworks
*/
, Cocoa, CoreAudio, CoreServices, AVFoundation, MediaToolbox
, VideoDecodeAcceleration, cf-private
, VideoDecodeAcceleration
}:
/* Maintainer notes:
@ -419,7 +419,7 @@ stdenv.mkDerivation rec {
++ optional nvenc nv-codec-headers
++ optionals stdenv.isDarwin [ Cocoa CoreServices CoreAudio AVFoundation
MediaToolbox VideoDecodeAcceleration
libiconv cf-private /* For _OBJC_EHTYPE_$_NSException */ ];
libiconv ];
buildFlags = [ "all" ]
++ optional qtFaststartProgram "tools/qt-faststart"; # Build qt-faststart executable
@ -427,14 +427,6 @@ stdenv.mkDerivation rec {
# Hacky framework patching technique borrowed from the phantomjs2 package
postInstall = optionalString qtFaststartProgram ''
cp -a tools/qt-faststart $out/bin/
'' + optionalString stdenv.isDarwin ''
FILES=($(ls $out/bin/*))
FILES+=($(ls $out/lib/*.dylib))
for f in ''${FILES[@]}; do
if [ ! -h "$f" ]; then
install_name_tool -change ${cf-private}/Library/Frameworks/CoreFoundation.framework/Versions/A/CoreFoundation /System/Library/Frameworks/CoreFoundation.framework/Versions/A/CoreFoundation "$f"
fi
done
'';
enableParallelBuilding = true;

32
pkgs/development/libraries/fltk/1.4.nix
View File

@ -1,11 +1,13 @@
{ stdenv, fetchurl, pkgconfig, xlibsWrapper, xorgproto, libXi
, freeglut, libGLU_combined, libjpeg, zlib, libXft, libpng
, libtiff, freetype, cf-private, Cocoa, AGL, GLUT
, libtiff, freetype, Cocoa, AGL, GLUT
}:
let
version = "1.4.x-r13121";
in stdenv.mkDerivation {
in
stdenv.mkDerivation {
name = "fltk-${version}";
src = fetchurl {
@ -13,19 +15,16 @@ in stdenv.mkDerivation {
sha256 = "1v8wxvxcbk99i82x2v5fpqg5vj8n7g8a38g30ry7nzcjn5sf3r63";
};
preConfigure = "make clean";
patches = stdenv.lib.optionals stdenv.isDarwin [ ./nsosv.patch ];
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ libGLU_combined libjpeg zlib libpng libXft ]
++ stdenv.lib.optional stdenv.isDarwin [ AGL Cocoa GLUT ];
buildInputs = [
libGLU_combined
libjpeg
zlib
libpng
libXft
];
propagatedBuildInputs = [ xorgproto ]
++ (if stdenv.isDarwin
then [ freetype libtiff ]
else [ xlibsWrapper libXi freeglut ]);
configureFlags = [
"--enable-gl"
@ -35,18 +34,15 @@ in stdenv.mkDerivation {
"--enable-xft"
];
propagatedBuildInputs = [ xorgproto ]
++ (if stdenv.isDarwin
then [ Cocoa AGL GLUT freetype libtiff cf-private /* Needed for NSDefaultRunLoopMode */ ]
else [ xlibsWrapper libXi freeglut ]);
preConfigure = "make clean";
enableParallelBuilding = true;
meta = {
meta = with stdenv.lib; {
description = "A C++ cross-platform lightweight GUI library";
homepage = http://www.fltk.org;
platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin;
license = stdenv.lib.licenses.gpl2;
platforms = platforms.linux ++ platforms.darwin;
license = licenses.gpl2;
};
}

31
pkgs/development/libraries/fltk/default.nix
View File

@ -1,11 +1,13 @@
{ stdenv, fetchurl, pkgconfig, xlibsWrapper, xorgproto, libXi
, freeglut, libGLU_combined, libjpeg, zlib, libXft, libpng
, libtiff, freetype, cf-private, Cocoa, AGL, GLUT
, libtiff, freetype, Cocoa, AGL, GLUT
}:
let
version = "1.3.5";
in stdenv.mkDerivation {
in
stdenv.mkDerivation {
name = "fltk-${version}";
src = fetchurl {
@ -16,14 +18,13 @@ in stdenv.mkDerivation {
patches = stdenv.lib.optionals stdenv.isDarwin [ ./nsosv.patch ];
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ libGLU_combined libjpeg zlib libpng libXft ]
++ stdenv.lib.optional stdenv.isDarwin [ AGL Cocoa GLUT ];
buildInputs = [
libGLU_combined
libjpeg
zlib
libpng
libXft
];
propagatedBuildInputs = [ xorgproto ]
++ (if stdenv.isDarwin
then [ freetype libtiff ]
else [ xlibsWrapper libXi freeglut ]);
configureFlags = [
"--enable-gl"
@ -33,18 +34,12 @@ in stdenv.mkDerivation {
"--enable-xft"
];
propagatedBuildInputs = [ xorgproto ]
++ (if stdenv.isDarwin
then [ Cocoa AGL GLUT freetype libtiff cf-private /* Needed for NSDefaultRunLoopMode */ ]
else [ xlibsWrapper libXi freeglut ]);
enableParallelBuilding = true;
meta = {
meta = with stdenv.lib; {
description = "A C++ cross-platform lightweight GUI library";
homepage = http://www.fltk.org;
platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin;
license = stdenv.lib.licenses.gpl2;
platforms = platforms.linux ++ platforms.darwin;
license = licenses.gpl2;
};
}

11
pkgs/development/libraries/glfw/3.x.nix
View File

@ -1,5 +1,5 @@
{ stdenv, lib, fetchFromGitHub, cmake, libGL, libXrandr, libXinerama, libXcursor, libX11
, cf-private, Cocoa, Kernel, fixDarwinDylibNames
, Cocoa, Kernel, fixDarwinDylibNames
}:
stdenv.mkDerivation rec {
@ -19,13 +19,8 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ cmake ];
buildInputs = [
libX11 libXrandr libXinerama libXcursor
] ++ lib.optionals stdenv.isDarwin [
Cocoa Kernel fixDarwinDylibNames
# Needed for NSDefaultRunLoopMode symbols.
cf-private
];
buildInputs = [ libX11 libXrandr libXinerama libXcursor ]
++ lib.optionals stdenv.isDarwin [ Cocoa Kernel fixDarwinDylibNames ];
cmakeFlags = [ "-DBUILD_SHARED_LIBS=ON" ];

3
pkgs/development/libraries/glib/default.nix
View File

@ -81,9 +81,6 @@ stdenv.mkDerivation rec {
utillinuxMinimal # for libmount
] ++ optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [
AppKit Carbon Cocoa CoreFoundation CoreServices Foundation
# Needed for CFURLCreateFromFSRef, etc. which have deen deprecated
# since 10.9 and are not part of swift-corelibs CoreFoundation.
darwin.cf-private
]);
nativeBuildInputs = [

4
pkgs/development/libraries/libui/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchgit, cmake, pkgconfig, gtk3, cf-private, Cocoa }:
{ stdenv, fetchgit, cmake, pkgconfig, gtk3, Cocoa }:
let
shortName = "libui";
@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ cmake pkgconfig ];
buildInputs = stdenv.lib.optional stdenv.isLinux gtk3
++ stdenv.lib.optionals stdenv.isDarwin [ Cocoa cf-private /* For NSDefaultRunLoopMode */ ];
++ stdenv.lib.optionals stdenv.isDarwin [ Cocoa ];
preConfigure = stdenv.lib.optionalString stdenv.isDarwin ''
sed -i 's/set(CMAKE_OSX_DEPLOYMENT_TARGET "10.8")//' ./CMakeLists.txt

4
pkgs/development/libraries/opencv/3.x.nix
View File

@ -31,7 +31,7 @@
, enableDC1394 ? false, libdc1394
, enableDocs ? false, doxygen, graphviz-nox
, cf-private, AVFoundation, Cocoa, VideoDecodeAcceleration, bzip2
, AVFoundation, Cocoa, VideoDecodeAcceleration, bzip2
}:
let
@ -206,7 +206,7 @@ stdenv.mkDerivation rec {
++ lib.optionals enableTesseract [ tesseract leptonica ]
++ lib.optional enableTbb tbb
++ lib.optional enableCuda cudatoolkit
++ lib.optionals stdenv.isDarwin [ cf-private AVFoundation Cocoa VideoDecodeAcceleration bzip2 ]
++ lib.optionals stdenv.isDarwin [ bzip2 AVFoundation Cocoa VideoDecodeAcceleration ]
++ lib.optionals enableDocs [ doxygen graphviz-nox ];
propagatedBuildInputs = lib.optional enablePython pythonPackages.numpy;

4
pkgs/development/libraries/opencv/4.x.nix
View File

@ -31,7 +31,7 @@
, enableDC1394 ? false, libdc1394
, enableDocs ? false, doxygen, graphviz-nox
, cf-private, AVFoundation, Cocoa, VideoDecodeAcceleration, bzip2
, AVFoundation, Cocoa, VideoDecodeAcceleration, bzip2
}:
let
@ -213,7 +213,7 @@ stdenv.mkDerivation rec {
++ lib.optionals enableTesseract [ tesseract leptonica ]
++ lib.optional enableTbb tbb
++ lib.optional enableCuda cudatoolkit
++ lib.optionals stdenv.isDarwin [ cf-private AVFoundation Cocoa VideoDecodeAcceleration bzip2 ]
++ lib.optionals stdenv.isDarwin [ bzip2 AVFoundation Cocoa VideoDecodeAcceleration ]
++ lib.optionals enableDocs [ doxygen graphviz-nox ];
propagatedBuildInputs = lib.optional enablePython pythonPackages.numpy;

4
pkgs/development/libraries/opencv/default.nix
View File

@ -10,7 +10,7 @@
, enableFfmpeg ? false, ffmpeg
, enableGStreamer ? false, gst_all_1
, enableEigen ? true, eigen
, cf-private, Cocoa, QTKit
, Cocoa, QTKit
}:
let
@ -54,7 +54,7 @@ stdenv.mkDerivation rec {
++ lib.optional enableFfmpeg ffmpeg
++ lib.optionals enableGStreamer (with gst_all_1; [ gstreamer gst-plugins-base ])
++ lib.optional enableEigen eigen
++ lib.optionals stdenv.isDarwin [ Cocoa QTKit cf-private /* For NSDefaultRunLoopMode */ ]
++ lib.optionals stdenv.isDarwin [ Cocoa QTKit ]
;
propagatedBuildInputs = lib.optional enablePython pythonPackages.numpy;

4
pkgs/development/libraries/pcl/default.nix
View File

@ -1,6 +1,6 @@
{ stdenv, fetchFromGitHub, cmake
, qhull, flann, boost, vtk, eigen, pkgconfig, qtbase
, libusb1, libpcap, libXt, libpng, Cocoa, AGL, cf-private, OpenGL
, libusb1, libpcap, libXt, libpng, Cocoa, AGL, OpenGL
}:
stdenv.mkDerivation rec {
@ -18,8 +18,8 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ pkgconfig cmake ];
buildInputs = [ qhull flann boost eigen libusb1 libpcap
libpng vtk qtbase libXt ]
++ stdenv.lib.optionals stdenv.isDarwin [ Cocoa AGL ];
++ stdenv.lib.optionals stdenv.isDarwin [ Cocoa AGL cf-private ];
cmakeFlags = stdenv.lib.optionals stdenv.isDarwin [
"-DOPENGL_INCLUDE_DIR=${OpenGL}/Library/Frameworks"
];

4
pkgs/development/libraries/qt-4.x/4.8/default.nix
View File

@ -14,7 +14,7 @@
, examples ? false
, demos ? false
# darwin support
, cf-private, libobjc, ApplicationServices, OpenGL, Cocoa, AGL, libcxx
, libobjc, ApplicationServices, OpenGL, Cocoa, AGL, libcxx
}:
let
@ -189,7 +189,7 @@ stdenv.mkDerivation rec {
postgresql sqlite libjpeg libmng libtiff icu ]
++ lib.optionals (mysql != null) [ mysql.connector-c ]
++ lib.optionals gtkStyle [ gtk2 gdk_pixbuf ]
++ lib.optionals stdenv.isDarwin [ cf-private ApplicationServices OpenGL Cocoa AGL libcxx libobjc ];
++ lib.optionals stdenv.isDarwin [ ApplicationServices OpenGL Cocoa AGL libcxx libobjc ];
nativeBuildInputs = [ perl pkgconfig which ];

10
pkgs/development/libraries/qt-5/5.11/default.nix
View File

@ -20,7 +20,7 @@ top-level attribute to `top-level/all-packages.nix`.
stdenv, fetchurl, fetchFromGitHub, makeSetupHook,
bison, cups ? null, harfbuzz, libGL, perl,
gstreamer, gst-plugins-base, gtk3, dconf,
cf-private, llvmPackages_5,
llvmPackages_5,
# options
developerBuild ? false,
@ -92,17 +92,13 @@ let
};
qtcharts = callPackage ../modules/qtcharts.nix {};
qtconnectivity = callPackage ../modules/qtconnectivity.nix {
inherit cf-private;
};
qtconnectivity = callPackage ../modules/qtconnectivity.nix {};
qtdeclarative = callPackage ../modules/qtdeclarative.nix {};
qtdoc = callPackage ../modules/qtdoc.nix {};
qtgraphicaleffects = callPackage ../modules/qtgraphicaleffects.nix {};
qtimageformats = callPackage ../modules/qtimageformats.nix {};
qtlocation = callPackage ../modules/qtlocation.nix { };
qtmacextras = callPackage ../modules/qtmacextras.nix {
inherit cf-private;
};
qtmacextras = callPackage ../modules/qtmacextras.nix {};
qtmultimedia = callPackage ../modules/qtmultimedia.nix {
inherit gstreamer gst-plugins-base;
};

10
pkgs/development/libraries/qt-5/5.12/default.nix
View File

@ -20,7 +20,7 @@ top-level attribute to `top-level/all-packages.nix`.
stdenv, fetchurl, fetchFromGitHub, makeSetupHook,
bison, cups ? null, harfbuzz, libGL, perl,
gstreamer, gst-plugins-base, gtk3, dconf,
cf-private, llvmPackages_5,
llvmPackages_5,
# options
developerBuild ? false,
@ -97,17 +97,13 @@ let
};
qtcharts = callPackage ../modules/qtcharts.nix {};
qtconnectivity = callPackage ../modules/qtconnectivity.nix {
inherit cf-private;
};
qtconnectivity = callPackage ../modules/qtconnectivity.nix {};
qtdeclarative = callPackage ../modules/qtdeclarative.nix {};
qtdoc = callPackage ../modules/qtdoc.nix {};
qtgraphicaleffects = callPackage ../modules/qtgraphicaleffects.nix {};
qtimageformats = callPackage ../modules/qtimageformats.nix {};
qtlocation = callPackage ../modules/qtlocation.nix {};
qtmacextras = callPackage ../modules/qtmacextras.nix {
inherit cf-private;
};
qtmacextras = callPackage ../modules/qtmacextras.nix {};
qtmultimedia = callPackage ../modules/qtmultimedia.nix {
inherit gstreamer gst-plugins-base;
};

5
pkgs/development/libraries/qt-5/5.6/default.nix
View File

@ -29,7 +29,6 @@ existing packages here and modify it as necessary.
stdenv, fetchurl, fetchpatch, makeSetupHook,
bison, cups ? null, harfbuzz, libGL, perl,
gstreamer, gst-plugins-base,
cf-private,
# options
developerBuild ? false,
@ -133,9 +132,7 @@ let
/* qtactiveqt = not packaged */
/* qtandroidextras = not packaged */
/* qtcanvas3d = not packaged */
qtconnectivity = callPackage ../modules/qtconnectivity.nix {
inherit cf-private;
};
qtconnectivity = callPackage ../modules/qtconnectivity.nix {};
qtdeclarative = callPackage ../modules/qtdeclarative.nix {};
qtdoc = callPackage ../modules/qtdoc.nix {};
qtgraphicaleffects = callPackage ../modules/qtgraphicaleffects.nix {};

9
pkgs/development/libraries/qt-5/5.9/default.nix
View File

@ -20,7 +20,6 @@ top-level attribute to `top-level/all-packages.nix`.
stdenv, fetchurl, fetchpatch, makeSetupHook,
bison, cups ? null, harfbuzz, libGL, perl,
gstreamer, gst-plugins-base, gtk3, dconf,
cf-private,
# options
developerBuild ? false,
@ -94,17 +93,13 @@ let
};
qtcharts = callPackage ../modules/qtcharts.nix {};
qtconnectivity = callPackage ../modules/qtconnectivity.nix {
inherit cf-private;
};
qtconnectivity = callPackage ../modules/qtconnectivity.nix {};
qtdeclarative = callPackage ../modules/qtdeclarative.nix {};
qtdoc = callPackage ../modules/qtdoc.nix {};
qtgraphicaleffects = callPackage ../modules/qtgraphicaleffects.nix {};
qtimageformats = callPackage ../modules/qtimageformats.nix {};
qtlocation = callPackage ../modules/qtlocation.nix {};
qtmacextras = callPackage ../modules/qtmacextras.nix {
inherit cf-private;
};
qtmacextras = callPackage ../modules/qtmacextras.nix {};
qtmultimedia = callPackage ../modules/qtmultimedia.nix {
inherit gstreamer gst-plugins-base;
};

2
pkgs/development/libraries/qt-5/modules/qtbase.nix
View File

@ -78,8 +78,6 @@ stdenv.mkDerivation {
[ libinput ]
++ lib.optional withGtk3 gtk3
)
# Needed for OBJC_CLASS_$_NSDate symbols.
++ lib.optional stdenv.isDarwin darwin.cf-private
++ lib.optional developerBuild gdb
++ lib.optional (cups != null) cups
++ lib.optional (mysql != null) mysql.connector-c

4
pkgs/development/libraries/qt-5/modules/qtconnectivity.nix
View File

@ -1,8 +1,8 @@
{ qtModule, stdenv, qtbase, qtdeclarative, bluez, cf-private }:
{ qtModule, stdenv, qtbase, qtdeclarative, bluez }:
qtModule {
name = "qtconnectivity";
qtInputs = [ qtbase qtdeclarative ];
buildInputs = if stdenv.isDarwin then [ cf-private ] else [ bluez ];
buildInputs = stdenv.lib.optional stdenv.isLinux bluez;
outputs = [ "out" "dev" "bin" ];
}

6
pkgs/development/libraries/qt-5/modules/qtmacextras.nix
View File

@ -1,10 +1,8 @@
{ stdenv, qtModule, qtbase, cf-private }:
{ stdenv, qtModule, qtbase }:
qtModule {
name = "qtmacextras";
qtInputs = [ qtbase ]
# Needed for _OBJC_CLASS_$_NSData symbols.
++ stdenv.lib.optional stdenv.isDarwin cf-private;
qtInputs = [ qtbase ];
meta = with stdenv.lib; {
maintainers = with maintainers; [ periklis ];
platforms = platforms.darwin;

8
pkgs/development/libraries/qt-5/modules/qtwebengine.nix
View File

@ -200,14 +200,6 @@ EOF
(runCommand "MacOS_SDK_sandbox.h" {} ''
install -Dm444 "${lib.getDev darwin.apple_sdk.sdk}"/include/sandbox.h "$out"/include/sandbox.h
'')
# For:
# _NSDefaultRunLoopMode
# _OBJC_CLASS_$_NSDate
# _OBJC_CLASS_$_NSDictionary
# _OBJC_CLASS_$_NSRunLoop
# _OBJC_CLASS_$_NSURL
darwin.cf-private
]);
__impureHostDeps = optional stdenv.isDarwin "/usr/lib/libsandbox.1.dylib";

2
pkgs/development/libraries/qt-5/modules/qtwebkit.nix
View File

@ -28,7 +28,7 @@ qtModule {
++ optional (stdenv.isDarwin && lib.versionAtLeast qtbase.version "5.9.0") qtmultimedia
++ optional usingAnnulenWebkitFork qtwebchannel;
buildInputs = [ fontconfig libwebp libxml2 libxslt sqlite glib gst_all_1.gstreamer gst_all_1.gst-plugins-base ]
++ optionals (stdenv.isDarwin) (with darwin; with apple_sdk.frameworks; [ cf-private ICU OpenGL ])
++ optionals (stdenv.isDarwin) (with darwin; with apple_sdk.frameworks; [ ICU OpenGL ])
++ optional usingAnnulenWebkitFork hyphen;
nativeBuildInputs = [
bison2 flex gdb gperf perl pkgconfig python2 ruby

10
pkgs/development/libraries/qt-5/modules/qtwebview.nix
View File

@ -1,20 +1,14 @@
{ darwin, stdenv, qtModule, qtdeclarative, qtwebengine }:
with stdenv.lib;
qtModule {
name = "qtwebview";
qtInputs = [ qtdeclarative qtwebengine ];
buildInputs = optional (stdenv.isDarwin) [
darwin.apple_sdk.frameworks.CoreFoundation
darwin.apple_sdk.frameworks.WebKit
# For:
# _OBJC_CLASS_$_NSArray
# _OBJC_CLASS_$_NSDate
# _OBJC_CLASS_$_NSURL
darwin.cf-private
];
outputs = [ "out" "dev" "bin" ];
NIX_LDFLAGS = optionalString stdenv.isDarwin "-framework CoreFoundation -framework WebKit";
}
}

7
pkgs/development/libraries/sfml/default.nix
View File

@ -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"

6
pkgs/development/libraries/tk/generic.nix
View File

@ -32,11 +32,9 @@ stdenv.mkDerivation {
++ stdenv.lib.optional enableAqua "--enable-aqua";
nativeBuildInputs = [ pkgconfig ];
buildInputs = lib.optional enableAqua (with darwin.apple_sdk.frameworks; [ Cocoa ]);
propagatedBuildInputs = [ tcl libXft ]
++ lib.optional enableAqua (with darwin; with apple_sdk.frameworks; [
Cocoa cf-private
]);
propagatedBuildInputs = [ tcl libXft ];
doCheck = false; # fails. can't find itself

16
pkgs/development/libraries/vtk/default.nix
View File

@ -2,7 +2,7 @@
, qtLib ? null
# Darwin support
, Cocoa, CoreServices, DiskArbitration, IOKit, CFNetwork, Security, GLUT, OpenGL
, ApplicationServices, CoreText, IOSurface, cf-private, ImageIO, xpc, libobjc }:
, ApplicationServices, CoreText, IOSurface, ImageIO, xpc, libobjc }:
with stdenv.lib;
@ -20,13 +20,13 @@ stdenv.mkDerivation rec {
sha256 = "1hrjxkcvs3ap0bdhk90vymz5pgvxmg7q6sz8ab3wsyddbshr1abq";
};
buildInputs =
if !stdenv.isDarwin
then [ cmake libGLU_combined libX11 xorgproto libXt ] ++ optional (qtLib != null) qtLib
else [ cmake qtLib xpc CoreServices DiskArbitration IOKit cf-private
CFNetwork Security ApplicationServices CoreText IOSurface ImageIO
OpenGL GLUT ];
propagatedBuildInputs = stdenv.lib.optionals stdenv.isDarwin [ Cocoa libobjc ];
buildInputs = [ cmake ]
++ optional (qtLib != null) qtLib
++ optionals stdenv.isLinux [ libGLU_combined libX11 xorgproto libXt ]
++ optionals stdenv.isDarwin [ xpc Cocoa CoreServices DiskArbitration IOKit
CFNetwork Security ApplicationServices CoreText
IOSurface ImageIO OpenGL GLUT ];
propagatedBuildInputs = stdenv.lib.optionals stdenv.isDarwin [ libobjc ];
preBuild = ''

11
pkgs/development/libraries/wxwidgets/3.0/mac.nix
View File

@ -1,6 +1,6 @@
{ stdenv, fetchzip, expat, libiconv, libjpeg, libpng, libtiff, zlib
# darwin only attributes
, cf-private, derez, rez, setfile
, derez, rez, setfile
, AGL, Cocoa, Kernel
}:
@ -16,15 +16,9 @@ stdenv.mkDerivation rec {
buildInputs = [
expat libiconv libjpeg libpng libtiff zlib
derez rez setfile
Cocoa Kernel
# Needed for CFURLGetFSRef, etc. which have deen deprecated
# since 10.9 and are not part of swift-corelibs CoreFoundation.
cf-private
AGL Cocoa Kernel
];
propagatedBuildInputs = [ AGL ];
postPatch = ''
substituteInPlace configure --replace "-framework System" -lSystem
'';
@ -71,6 +65,5 @@ stdenv.mkDerivation rec {
homepage = https://www.wxwidgets.org/;
description = "a C++ library that lets developers create applications for Windows, macOS, Linux and other platforms with a single code base";
longDescription = "wxWidgets gives you a single, easy-to-use API for writing GUI applications on multiple platforms that still utilize the native platform's controls and utilities. Link with the appropriate library for your platform and compiler, and your application will adopt the look and feel appropriate to that platform. On top of great GUI functionality, wxWidgets gives you: online help, network programming, streams, clipboard and drag and drop, multithreading, image loading and saving in a variety of popular formats, database support, HTML viewing and printing, and much more.";
broken = true;
};
}

2
pkgs/development/python-modules/watchdog/default.nix
View File

@ -17,7 +17,7 @@ buildPythonPackage rec {
};
buildInputs = stdenv.lib.optionals stdenv.isDarwin
[ pkgs.darwin.apple_sdk.frameworks.CoreServices pkgs.darwin.cf-private ];
[ pkgs.darwin.apple_sdk.frameworks.CoreServices ];
propagatedBuildInputs = [ argh pathtools pyyaml ];
doCheck = false;

4
pkgs/development/tools/analysis/flow/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, ocamlPackages, cf-private, CoreServices }:
{ stdenv, fetchFromGitHub, ocamlPackages, CoreServices }:
stdenv.mkDerivation rec {
pname = "flow";
@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
'';
buildInputs = (with ocamlPackages; [ ocaml findlib ocamlbuild dtoa core_kernel sedlex ocaml_lwt lwt_log lwt_ppx ppx_deriving ppx_gen_rec ppx_tools_versioned visitors wtf8 ])
++ stdenv.lib.optionals stdenv.isDarwin [ cf-private CoreServices ];
++ stdenv.lib.optionals stdenv.isDarwin [ CoreServices ];
meta = with stdenv.lib; {
description = "A static type checker for JavaScript";

8
pkgs/development/tools/cargo-web/default.nix
View File

@ -1,5 +1,5 @@
{ stdenv, fetchFromGitHub, openssl, perl, pkgconfig, rustPlatform
, CoreServices, Security, cf-private
, CoreServices, Security
}:
rustPlatform.buildRustPackage rec {
@ -16,11 +16,7 @@ rustPlatform.buildRustPackage rec {
cargoSha256 = "1f4sj260q4rlzbajwimya1yhh90hmmbhr47yfg9i8xcv5cg0cqjn";
nativeBuildInputs = [ openssl perl pkgconfig ];
buildInputs = stdenv.lib.optionals stdenv.isDarwin [
CoreServices Security
# Needed for CFURLResourceIsReachable symbols.
cf-private
];
buildInputs = stdenv.lib.optionals stdenv.isDarwin [ CoreServices Security ];
meta = with stdenv.lib; {
description = "A Cargo subcommand for the client-side Web";

25
pkgs/development/tools/watchman/default.nix
View File

@ -1,12 +1,11 @@
{ stdenv, lib, config, fetchFromGitHub, autoconf, automake, pcre,
libtool, pkgconfig, openssl,
confFile ? config.watchman.confFile or null,
withApple ? stdenv.isDarwin, CoreServices, CoreFoundation
{ stdenv, lib, config, fetchFromGitHub, autoconf, automake, pcre
, libtool, pkgconfig, openssl
, confFile ? config.watchman.confFile or null
, withApple ? stdenv.isDarwin, CoreServices
}:
stdenv.mkDerivation rec {
name = "watchman-${version}";
version = "4.9.0";
src = fetchFromGitHub {
@ -16,18 +15,18 @@ stdenv.mkDerivation rec {
sha256 = "0fdaj5pmicm6j17d5q7px800m5rmam1a400x3hv1iiifnmhgnkal";
};
buildInputs = [ pcre openssl ]
++ lib.optionals withApple [ CoreFoundation CoreServices ];
nativeBuildInputs = [ autoconf automake pkgconfig libtool ];
buildInputs = [ pcre openssl ]
++ lib.optionals withApple [ CoreServices ];
configureFlags = [
"--enable-lenient"
"--enable-conffile=${if confFile == null then "no" else confFile}"
"--with-pcre=yes"
"--enable-lenient"
"--enable-conffile=${if confFile == null then "no" else confFile}"
"--with-pcre=yes"
# For security considerations re: --disable-statedir, see:
# https://github.com/facebook/watchman/issues/178
"--disable-statedir"
# For security considerations re: --disable-statedir, see:
# https://github.com/facebook/watchman/issues/178
"--disable-statedir"
];
prePatch = ''

4
pkgs/games/gargoyle/default.nix
View File

@ -1,5 +1,5 @@
{ stdenv, fetchFromGitHub, substituteAll, jam, cctools, pkgconfig
, SDL, SDL_mixer, SDL_sound, cf-private, gtk2, libvorbis, smpeg }:
, SDL, SDL_mixer, SDL_sound, gtk2, libvorbis, smpeg }:
let
@ -32,7 +32,7 @@ stdenv.mkDerivation {
nativeBuildInputs = [ jam pkgconfig ] ++ stdenv.lib.optional stdenv.isDarwin cctools;
buildInputs = [ SDL SDL_mixer SDL_sound gtk2 ]
++ stdenv.lib.optionals stdenv.isDarwin [ cf-private smpeg libvorbis ];
++ stdenv.lib.optionals stdenv.isDarwin [ smpeg libvorbis ];
buildPhase = jamenv + "jam -j$NIX_BUILD_CORES";

4
pkgs/misc/emulators/dolphin-emu/master.nix
View File

@ -5,7 +5,7 @@
, soundtouch, sfml, vulkan-loader ? null, libpulseaudio ? null
# - Inputs used for Darwin
, CoreBluetooth, cf-private, ForceFeedback, IOKit, OpenGL, libpng, hidapi }:
, CoreBluetooth, ForceFeedback, IOKit, OpenGL, libpng, hidapi }:
let
desktopItem = makeDesktopItem {
@ -41,7 +41,7 @@ in stdenv.mkDerivation rec {
] ++ stdenv.lib.optionals stdenv.isLinux [
bluez udev libevdev alsaLib vulkan-loader
] ++ stdenv.lib.optionals stdenv.isDarwin [
CoreBluetooth cf-private OpenGL ForceFeedback IOKit
CoreBluetooth OpenGL ForceFeedback IOKit
];
cmakeFlags = [

4
pkgs/misc/jackaudio/default.nix
View File

@ -3,7 +3,7 @@
, bash, libsamplerate, libsndfile, readline, eigen, celt
, wafHook
# Darwin Dependencies
, aften, AudioUnit, CoreAudio, cf-private, libobjc, Accelerate
, aften, AudioUnit, CoreAudio, libobjc, Accelerate
# Optional Dependencies
, dbus ? null, libffado ? null, alsaLib ? null
@ -41,7 +41,7 @@ stdenv.mkDerivation rec {
buildInputs = [ libsamplerate libsndfile readline eigen celt
optDbus optPythonDBus optLibffado optAlsaLib optLibopus
] ++ optionals stdenv.isDarwin [
aften AudioUnit CoreAudio Accelerate cf-private libobjc
aften AudioUnit CoreAudio Accelerate libobjc
];
prePatch = ''

9
pkgs/os-specific/darwin/cf-private/setup-hook.sh → pkgs/os-specific/darwin/apple-sdk/cf-setup-hook.sh
View File

@ -1,12 +1,9 @@
prependSearchPath() {
NIX_CFLAGS_COMPILE="-F@out@/Library/Frameworks ${NIX_CFLAGS_COMPILE}"
}
linkWithRealCF() {
linkSystemCoreFoundationFramework() {
NIX_CFLAGS_COMPILE="-F@out@/Library/Frameworks $NIX_CFLAGS_COMPILE"
# gross! many symbols (such as _OBJC_CLASS_$_NSArray) are defined in system CF, but not
# in the opensource release
# if the package needs private headers, we assume they also want to link with system CF
NIX_LDFLAGS+=" /System/Library/Frameworks/CoreFoundation.framework/Versions/A/CoreFoundation"
}
preConfigureHooks+=(prependSearchPath linkWithRealCF)
preConfigureHooks+=(linkSystemCoreFoundationFramework)

8
pkgs/os-specific/darwin/apple-sdk/default.nix
View File

@ -156,7 +156,7 @@ in rec {
__propagatedImpureHostDeps = [ "/usr/lib/libXplugin.1.dylib" ];
propagatedBuildInputs = with frameworks; [
OpenGL ApplicationServices Carbon IOKit pkgs.darwin.CF CoreGraphics CoreServices CoreText
OpenGL ApplicationServices Carbon IOKit CoreGraphics CoreServices CoreText
];
installPhase = ''
@ -187,6 +187,10 @@ in rec {
];
});
CoreFoundation = stdenv.lib.overrideDerivation super.CoreFoundation (drv: {
setupHook = ./cf-setup-hook.sh;
});
CoreMedia = stdenv.lib.overrideDerivation super.CoreMedia (drv: {
__propagatedImpureHostDeps = drv.__propagatedImpureHostDeps ++ [
"/System/Library/Frameworks/CoreImage.framework"
@ -222,7 +226,7 @@ in rec {
bareFrameworks = stdenv.lib.mapAttrs framework (import ./frameworks.nix {
inherit frameworks libs;
inherit (pkgs.darwin) CF cf-private libobjc;
inherit (pkgs.darwin) libobjc;
});
frameworks = bareFrameworks // overrides bareFrameworks;

79
pkgs/os-specific/darwin/apple-sdk/frameworks.nix
View File

@ -2,81 +2,81 @@
# Epic weird knot-tying happening here.
# TODO: clean up the process for generating this and include it
{ frameworks, libs, CF, libobjc, cf-private }:
{ frameworks, libs, libobjc, }:
with frameworks; with libs; {
AGL = [ Carbon OpenGL ];
AVFoundation = [ ApplicationServices CoreGraphics ];
AVKit = [];
Accounts = [];
AddressBook = [ Carbon CF ];
AddressBook = [ Carbon ];
AppKit = [ AudioToolbox AudioUnit Foundation QuartzCore ];
AppKitScripting = [];
AppleScriptKit = [];
AppleScriptObjC = [];
AudioToolbox = [ CoreAudio CF CoreMIDI ];
AudioUnit = [ AudioToolbox Carbon CoreAudio CF ];
AudioToolbox = [ CoreAudio CoreMIDI ];
AudioUnit = [ AudioToolbox Carbon CoreAudio ];
AudioVideoBridging = [ Foundation ];
Automator = [];
CFNetwork = [ CF ];
CFNetwork = [];
CalendarStore = [];
Cocoa = [ AppKit ];
Collaboration = [];
# Impure version of CoreFoundation, this should not be used unless another
# framework includes headers that are not available in the pure version.
CoreFoundation = [];
CoreAudio = [ CF IOKit ];
CoreAudio = [ IOKit ];
CoreAudioKit = [ AudioUnit ];
CoreData = [];
CoreGraphics = [ Accelerate CF IOKit IOSurface SystemConfiguration ];
CoreImage = [ ];
CoreGraphics = [ Accelerate IOKit IOSurface SystemConfiguration ];
CoreImage = [];
CoreLocation = [];
CoreMIDI = [ CF ];
CoreMIDI = [];
CoreMIDIServer = [];
CoreMedia = [ ApplicationServices AudioToolbox AudioUnit CoreAudio CF CoreGraphics CoreVideo ];
CoreMediaIO = [ CF CoreMedia ];
CoreText = [ CF CoreGraphics ];
CoreVideo = [ ApplicationServices CF CoreGraphics IOSurface OpenGL ];
CoreMedia = [ ApplicationServices AudioToolbox AudioUnit CoreAudio CoreGraphics CoreVideo ];
CoreMediaIO = [ CoreMedia ];
CoreText = [ CoreGraphics ];
CoreVideo = [ ApplicationServices CoreGraphics IOSurface OpenGL ];
CoreWLAN = [ SecurityFoundation ];
DVDPlayback = [];
DirectoryService = [ CF ];
DiscRecording = [ CF CoreServices IOKit ];
DirectoryService = [];
DiscRecording = [ CoreServices IOKit ];
DiscRecordingUI = [];
DiskArbitration = [ CF IOKit ];
DiskArbitration = [ IOKit ];
EventKit = [];
ExceptionHandling = [];
FWAUserLib = [];
ForceFeedback = [ CF IOKit ];
Foundation = [ cf-private libobjc Security ApplicationServices SystemConfiguration ];
GLKit = [ CF ];
ForceFeedback = [ IOKit ];
Foundation = [ libobjc CoreFoundation Security ApplicationServices SystemConfiguration ];
GLKit = [];
GLUT = [ OpenGL ];
GSS = [];
GameController = [];
GameKit = [ Foundation ];
Hypervisor = [];
ICADevices = [ Carbon CF IOBluetooth ];
ICADevices = [ Carbon IOBluetooth ];
IMServicePlugIn = [];
IOBluetoothUI = [ IOBluetooth ];
IOKit = [ CF ];
IOSurface = [ CF IOKit xpc ];
IOKit = [];
IOSurface = [ IOKit xpc ];
ImageCaptureCore = [];
ImageIO = [ CF CoreGraphics ];
ImageIO = [ CoreGraphics ];
InputMethodKit = [ Carbon ];
InstallerPlugins = [];
InstantMessage = [];
JavaFrameEmbedding = [];
JavaScriptCore = [ CF ];
JavaScriptCore = [];
Kerberos = [];
Kernel = [ CF IOKit ];
Kernel = [ IOKit ];
LDAP = [];
LatentSemanticMapping = [ Carbon CF ];
LatentSemanticMapping = [ Carbon ];
MapKit = [];
MediaAccessibility = [ CF CoreGraphics CoreText QuartzCore ];
MediaToolbox = [ AudioToolbox AudioUnit CF CoreMedia ];
MediaAccessibility = [ CoreGraphics CoreText QuartzCore ];
MediaToolbox = [ AudioToolbox AudioUnit CoreMedia ];
Metal = [];
MetalKit = [ ModelIO Metal ];
ModelIO = [ ];
NetFS = [ CF ];
NetFS = [];
OSAKit = [ Carbon ];
OpenAL = [];
OpenCL = [ IOSurface OpenGL ];
@ -85,37 +85,38 @@ with frameworks; with libs; {
PreferencePanes = [];
PubSub = [];
QTKit = [ CoreMediaIO CoreMedia MediaToolbox QuickTime VideoToolbox ];
QuickLook = [ ApplicationServices CF ];
QuickLook = [ ApplicationServices ];
SceneKit = [];
ScreenSaver = [];
Scripting = [];
ScriptingBridge = [];
Security = [ CF IOKit ];
Security = [ IOKit ];
SecurityFoundation = [];
SecurityInterface = [ Security ];
ServiceManagement = [ CF Security ];
ServiceManagement = [ Security ];
Social = [];
SpriteKit = [];
StoreKit = [];
SyncServices = [];
SystemConfiguration = [ CF Security ];
SystemConfiguration = [ Security ];
TWAIN = [ Carbon ];
Tcl = [];
VideoDecodeAcceleration = [ CF CoreVideo ];
VideoToolbox = [ CF CoreMedia CoreVideo ];
VideoDecodeAcceleration = [ CoreVideo ];
VideoToolbox = [ CoreMedia CoreVideo ];
WebKit = [ ApplicationServices Carbon JavaScriptCore OpenGL ];
# Umbrellas
Accelerate = [ CoreWLAN IOBluetooth ];
ApplicationServices = [ CF CoreServices CoreText ImageIO ];
Carbon = [ ApplicationServices CF CoreServices Foundation IOKit Security QuartzCore ];
ApplicationServices = [ CoreServices CoreText ImageIO ];
Carbon = [ ApplicationServices CoreServices Foundation IOKit Security QuartzCore ];
CoreBluetooth = [];
CoreServices = [ CFNetwork CoreAudio CoreData CF DiskArbitration Security NetFS OpenDirectory ServiceManagement ];
# TODO: figure out which part of the umbrella depends on CoreFoundation and move it there.
CoreServices = [ CFNetwork CoreFoundation CoreAudio CoreData DiskArbitration Security NetFS OpenDirectory ServiceManagement ];
IOBluetooth = [ IOKit ];
JavaVM = [];
OpenDirectory = [];
Quartz = [ QuickLook QTKit ];
QuartzCore = [ ApplicationServices CF CoreVideo OpenCL CoreImage Metal ];
QuartzCore = [ ApplicationServices CoreVideo OpenCL CoreImage Metal ];
QuickTime = [ ApplicationServices AudioUnit Carbon CoreAudio CoreServices OpenGL QuartzCore ];
vmnet = [];

58
pkgs/os-specific/darwin/cf-private/default.nix
View File

@ -1,58 +0,0 @@
{ CF, apple_sdk }:
# cf-private is a bit weird, but boils down to CF with a weird setup-hook that
# makes a build link against the system CoreFoundation rather than our pure one.
# The reason it exists is that although our CF headers and build are pretty legit
# now, the underlying runtime is quite different. Apple's in a bit of flux around CF
# right now, and support three different backends for it: swift, "C", and an ObjC
# one. The former two can be built from public sources, but the ObjC one isn't really
# public. Unfortunately, it's also one of the core underpinnings of a lot of Mac-
# specific behavior, and defines a lot of symbols that some Objective C apps depend
# on, even though one might expect those symbols to derive from Foundation. So if
# your app relies on NSArray and several other basic ObjC types, it turns out that
# because of their magic "toll-free bridging" support, the symbols for those types
# live in CoreFoundation with an ObjC runtime. And because that isn't public, we have
# this hack in place to let people link properly anyway. Phew!
#
# This can be revisited if Apple ever decide to release the ObjC backend in a publicly
# buildable form.
#
# This doesn't really need to rebuild CF, but it's cheap, and adding a setup hook to
# an existing package was annoying. We need a buildEnv that knows how to add those
CF.overrideAttrs (orig: {
# PLEASE if you add things to this derivation, explain in reasonable detail why
# you're adding them and when the workaround can go away. This whole derivation is
# a workaround and if you don't explain what you're working around, it makes it
# very hard for people to clean it up later.
name = "${orig.name}-private";
setupHook = ./setup-hook.sh;
# TODO: consider re-adding https://github.com/NixOS/nixpkgs/blob/master/pkgs/os-specific/darwin/apple-source-releases/CF/cf-bridging.patch
# once the missing headers are in and see if that fixes all need for this.
# This can go away once https://bugs.swift.org/browse/SR-8741 happens, which is
# looking more likely these days with the friendly people at Apple! We only need
# the header because the setup hook takes care of linking us against a version
# of the framework with the functionality built into it. The main user I know of
# this is watchman, who can almost certainly switch to the pure CF once the header
# and functionality is merged in.
installPhase = orig.installPhase + ''
basepath="Library/Frameworks/CoreFoundation.framework/Headers"
# Append the include at top level or nobody will notice the header we're about to add
sed -i '/CFNotificationCenter.h/a #include <CoreFoundation/CFFileDescriptor.h>' \
"$out/$basepath/CoreFoundation.h"
cp ${apple_sdk.frameworks.CoreFoundation}/$basepath/CFFileDescriptor.h $out/$basepath/CFFileDescriptor.h
'' +
# This one is less likely to go away, but I'll mention it anyway. The issue is at
# https://bugs.swift.org/browse/SR-8744, and the main user I know of is qtbase
''
path="$basepath/CFURLEnumerator.h"
sed -i '/CFNotificationCenter.h/a #include <CoreFoundation/CFURLEnumerator.h>' \
"$out/$basepath/CoreFoundation.h"
cp ${apple_sdk.frameworks.CoreFoundation}/$path $out/$path
'';
})

9
pkgs/os-specific/darwin/trash/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, perl, cf-private, AppKit, Cocoa, ScriptingBridge }:
{ stdenv, fetchFromGitHub, perl, AppKit, Cocoa, ScriptingBridge }:
stdenv.mkDerivation rec {
version = "0.9.2";
@ -11,12 +11,7 @@ stdenv.mkDerivation rec {
sha256 = "1d3rc03vgz32faj7qi18iiggxvxlqrj9lsk5jkpa9r1mcs5d89my";
};
buildInputs = [
perl
Cocoa AppKit ScriptingBridge
# Neded for OBJC_CLASS_$_NSMutableArray symbols.
cf-private
];
buildInputs = [ perl Cocoa AppKit ScriptingBridge ];
patches = [ ./trash.diff ];

4
pkgs/servers/x11/quartz-wm/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, xorg, pixman, pkgconfig, AppKit, Foundation, Xplugin, cf-private }:
{ stdenv, fetchurl, xorg, pixman, pkgconfig, AppKit, Foundation, Xplugin }:
let version = "1.3.1";
in stdenv.mkDerivation {
@ -20,8 +20,6 @@ in stdenv.mkDerivation {
pixman
pkgconfig
AppKit Xplugin Foundation
# Needed for CFNotificationCenterAddObserver symbols.
cf-private
];
meta = with stdenv.lib; {
license = licenses.apsl20;

8
pkgs/servers/x11/xorg/overrides.nix
View File

@ -5,7 +5,7 @@
libGL, spice-protocol, zlib, libGLU, dbus, libunwind, libdrm,
mesa, udev, bootstrap_cmds, bison, flex, clangStdenv, autoreconfHook,
mcpp, epoxy, openssl, pkgconfig, llvm_6,
cf-private, ApplicationServices, Carbon, Cocoa, Xplugin
ApplicationServices, Carbon, Cocoa, Xplugin
}:
let
@ -469,11 +469,7 @@ self: super:
sha256 = "1j1i3n5xy1wawhk95kxqdc54h34kg7xp4nnramba2q8xqfr5k117";
};
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ xorgproto libdrm openssl libX11 libXau libXaw libxcb xcbutil xcbutilwm xcbutilimage xcbutilkeysyms xcbutilrenderutil libXdmcp libXfixes libxkbfile libXmu libXpm libXrender libXres libXt ]
++ stdenv.lib.optionals stdenv.isDarwin [
# Needed for NSDefaultRunLoopMode symbols.
cf-private
];
buildInputs = [ xorgproto libdrm openssl libX11 libXau libXaw libxcb xcbutil xcbutilwm xcbutilimage xcbutilkeysyms xcbutilrenderutil libXdmcp libXfixes libxkbfile libXmu libXpm libXrender libXres libXt ];
postPatch = stdenv.lib.optionalString stdenv.isLinux "sed '1i#include <malloc.h>' -i include/os.h";
meta.platforms = stdenv.lib.platforms.unix;
} else throw "unsupported xorg abiCompat ${abiCompat} for ${attrs_passed.name}";

7
pkgs/servers/x11/xquartz/default.nix
View File

@ -1,7 +1,6 @@
{ stdenv, buildEnv, makeFontsConf, gnused, writeScript, xorg, bashInteractive, xterm, makeWrapper, ruby
, quartz-wm, fontconfig, xlsfonts, xfontsel
, ttf_bitstream_vera, freefont_ttf, liberation_ttf
, cf-private
, shell ? "${bashInteractive}/bin/bash"
}:
@ -98,11 +97,7 @@ let
in stdenv.mkDerivation {
name = "xquartz-${stdenv.lib.getVersion xorg.xorgserver}";
buildInputs = [
ruby makeWrapper
# Needed for NSDefaultRunLoopMode symbols.
cf-private
];
nativeBuildInputs = [ ruby makeWrapper ];
unpackPhase = "sourceRoot=.";

9
pkgs/tools/misc/contacts/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, xcbuildHook, cf-private, Foundation, AddressBook }:
{ stdenv, fetchurl, xcbuildHook, Foundation, AddressBook }:
stdenv.mkDerivation rec {
version = "1.1a-3";
@ -10,12 +10,7 @@ stdenv.mkDerivation rec {
};
nativeBuildInputs = [ xcbuildHook ];
buildInputs = [
Foundation AddressBook
# Needed for OBJC_CLASS_$_NSArray symbols.
cf-private
];
buildInputs = [ Foundation AddressBook ];
installPhase = ''
mkdir -p $out/bin

4
pkgs/tools/misc/noti/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, buildGoPackage, fetchFromGitHub, cf-private, Cocoa }:
{ stdenv, buildGoPackage, fetchFromGitHub, Cocoa }:
buildGoPackage rec {
name = "noti-${version}";
@ -11,7 +11,7 @@ buildGoPackage rec {
sha256 = "1chsqfqk0pnhx5k2nr4c16cpb8m6zv69l1jvv4v4903zgfzcm823";
};
buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Cocoa cf-private /* For OBJC_CLASS_$_NSDate */ ];
buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Cocoa ];
# TODO: Remove this when we update apple_sdk
NIX_CFLAGS_COMPILE = stdenv.lib.optionals stdenv.isDarwin [ "-fno-objc-arc" ];

6
pkgs/tools/misc/watchexec/default.nix
View File

@ -13,11 +13,7 @@ rustPlatform.buildRustPackage rec {
cargoSha256 = "1sqwplvpg0n9j0h9j94m7a6ylgqi4y4wyx489y09z9gm7aqgrsjc";
buildInputs = stdenv.lib.optionals stdenv.isDarwin [
CoreServices
# This is needed to avoid an undefined symbol error "_CFURLResourceIsReachable"
darwin.cf-private
];
buildInputs = stdenv.lib.optionals stdenv.isDarwin [ CoreServices ];
meta = with stdenv.lib; {
description = "Executes commands in response to file modifications";

8
pkgs/tools/security/keybase/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, lib, buildGoPackage, fetchurl, cf-private
{ stdenv, lib, buildGoPackage, fetchurl
, AVFoundation, AudioToolbox, ImageIO, CoreMedia
, Foundation, CoreGraphics, MediaToolbox
}:
@ -17,11 +17,7 @@ buildGoPackage rec {
sha256 = "14c0876mxz3xa2k4d665kf8j6k3hc6qybkj0gr4pr9c9gs70cgjh";
};
buildInputs = lib.optionals stdenv.isDarwin [
AVFoundation AudioToolbox ImageIO CoreMedia Foundation CoreGraphics MediaToolbox
# Needed for OBJC_CLASS_$_NSData symbols.
cf-private
];
buildInputs = lib.optionals stdenv.isDarwin [ AVFoundation AudioToolbox ImageIO CoreMedia Foundation CoreGraphics MediaToolbox ];
buildFlags = [ "-tags production" ];
meta = with stdenv.lib; {

9
pkgs/tools/security/pinentry/mac.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, xcbuildHook, libiconv, Cocoa, ncurses, cf-private }:
{ stdenv, fetchFromGitHub, xcbuildHook, libiconv, ncurses, Cocoa }:
stdenv.mkDerivation rec {
name = "pinentry-mac-0.9.4";
@ -11,12 +11,7 @@ stdenv.mkDerivation rec {
};
nativeBuildInputs = [ xcbuildHook ];
buildInputs = [
libiconv Cocoa ncurses
# Needed for OBJC_CLASS_$_NSArray symbols.
cf-private
];
buildInputs = [ libiconv ncurses Cocoa ];
installPhase = ''
mkdir -p $out/Applications

6
pkgs/tools/text/mdbook/default.nix
View File

@ -13,11 +13,7 @@ rustPlatform.buildRustPackage rec {
cargoSha256 = "1xpsc4qff2lrq15mz1gvmw6n5vl88sfwpjbsnp5ja5k1im156lam";
buildInputs = stdenv.lib.optionals stdenv.isDarwin [
CoreServices
# This is needed to avoid an undefined symbol error for "_CFURLResourceIsReachable"
darwin.cf-private
];
buildInputs = stdenv.lib.optionals stdenv.isDarwin [ CoreServices ];
meta = with stdenv.lib; {
description = "Create books from MarkDown";

8
pkgs/tools/video/atomicparsley/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchhg, autoreconfHook, zlib, cf-private, Cocoa }:
{ stdenv, fetchhg, autoreconfHook, zlib, Cocoa }:
stdenv.mkDerivation rec {
name = "atomicparsley-${version}";
@ -12,11 +12,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ autoreconfHook ];
buildInputs = [ zlib ]
++ stdenv.lib.optionals stdenv.isDarwin [
Cocoa
# Needed for OBJC_CLASS_$_NSDictionary symbols.
cf-private
];
++ stdenv.lib.optionals stdenv.isDarwin [ Cocoa ];
configureFlags = stdenv.lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [
# AC_FUNC_MALLOC is broken on cross builds.

61
pkgs/top-level/all-packages.nix
View File

@ -522,8 +522,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 { };
@ -611,7 +610,6 @@ in
};
atomicparsley = callPackage ../tools/video/atomicparsley {
inherit (darwin) cf-private;
inherit (darwin.apple_sdk.frameworks) Cocoa;
};
@ -1331,7 +1329,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;
};
@ -1742,7 +1739,6 @@ in
noteshrink = callPackage ../tools/misc/noteshrink { };
noti = callPackage ../tools/misc/noti {
inherit (darwin) cf-private;
inherit (darwin.apple_sdk.frameworks) Cocoa;
};
@ -2556,7 +2552,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 { };
@ -3975,7 +3970,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
@ -5289,7 +5283,6 @@ in
};
pinentry_mac = callPackage ../tools/security/pinentry/mac.nix {
inherit (darwin) cf-private;
inherit (darwin.apple_sdk.frameworks) Cocoa;
xcbuildHook = xcbuild6Hook;
};
@ -6565,7 +6558,6 @@ in
watchman = callPackage ../development/tools/watchman {
inherit (darwin.apple_sdk.frameworks) CoreServices;
CoreFoundation = darwin.cf-private;
};
wavefunctioncollapse = callPackage ../tools/graphics/wavefunctioncollapse {};
@ -8040,7 +8032,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 { };
@ -9242,7 +9233,6 @@ in
flow = callPackage ../development/tools/analysis/flow {
inherit (darwin.apple_sdk.frameworks) CoreServices;
inherit (darwin) cf-private;
};
foreman = callPackage ../tools/system/foreman { };
@ -10399,7 +10389,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;
@ -10427,11 +10416,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;
@ -10594,7 +10581,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;
};
@ -12070,7 +12056,6 @@ in
libuecc = callPackage ../development/libraries/libuecc { };
libui = callPackage ../development/libraries/libui {
inherit (darwin) cf-private;
inherit (darwin.apple_sdk.frameworks) Cocoa;
};
@ -12531,12 +12516,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;
};
@ -12545,7 +12528,6 @@ in
};
opencv4 = callPackage ../development/libraries/opencv/4.x.nix {
inherit (darwin) cf-private;
inherit (darwin.apple_sdk.frameworks) AVFoundation Cocoa VideoDecodeAcceleration;
};
@ -12629,7 +12611,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;
};
@ -12776,7 +12757,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;
};
@ -12802,7 +12783,6 @@ in
harfbuzz = harfbuzzFull;
inherit libGL;
inherit perl;
inherit (darwin) cf-private;
inherit (gst_all_1) gstreamer gst-plugins-base;
});
@ -12817,7 +12797,6 @@ in
harfbuzz = harfbuzzFull;
inherit libGL;
inherit perl;
inherit (darwin) cf-private;
inherit (gst_all_1) gstreamer gst-plugins-base;
inherit gtk3;
inherit (gnome3) dconf;
@ -12834,7 +12813,6 @@ in
harfbuzz = harfbuzzFull;
inherit libGL;
inherit perl;
inherit (darwin) cf-private;
inherit gtk3;
inherit (gnome3) dconf;
inherit (gst_all_1) gstreamer gst-plugins-base;
@ -12852,7 +12830,6 @@ in
harfbuzz = harfbuzzFull;
inherit libGL;
inherit perl;
inherit (darwin) cf-private;
inherit gtk3;
inherit (gnome3) dconf;
inherit (gst_all_1) gstreamer gst-plugins-base;
@ -13110,7 +13087,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
@ -13134,7 +13110,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;
};
@ -13186,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 { };
@ -13631,7 +13605,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
@ -13747,7 +13721,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 {
@ -14923,13 +14896,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;
};
@ -14939,7 +14909,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;
@ -17526,7 +17495,6 @@ in
imagemagick = null;
acl = null;
gpm = null;
inherit (darwin) cf-private;
inherit (darwin.apple_sdk.frameworks) AppKit GSS ImageIO;
};
@ -17545,7 +17513,6 @@ in
imagemagick = null;
acl = null;
gpm = null;
inherit (darwin) cf-private;
inherit (darwin.apple_sdk.frameworks) AppKit GSS ImageIO;
};
@ -17556,7 +17523,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;
@ -18153,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 {
@ -18759,10 +18724,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;
};
@ -20371,7 +20333,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;
};
@ -20445,7 +20407,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 { };
@ -20642,7 +20603,6 @@ in
};
vim = callPackage ../applications/editors/vim {
inherit (darwin) cf-private;
inherit (darwin.apple_sdk.frameworks) Carbon Cocoa;
};
@ -20654,7 +20614,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;
});
@ -21310,7 +21270,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 { };
@ -21582,7 +21541,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 { };
@ -23054,13 +23013,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;
});
@ -23396,7 +23353,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

9
pkgs/top-level/darwin-packages.nix
View File

@ -10,6 +10,10 @@ in
callPackage = newScope (darwin.apple_sdk.frameworks // darwin);
stdenvNoCF = stdenv.override {
extraBuildInputs = [];
};
apple_sdk = callPackage ../os-specific/darwin/apple-sdk { };
binutils-unwrapped = callPackage ../os-specific/darwin/binutils {
@ -32,9 +36,8 @@ in
libcxxabi = pkgs.libcxxabi;
};
cf-private = callPackage ../os-specific/darwin/cf-private {
inherit (darwin) CF apple_sdk;
};
# TODO: remove alias.
cf-private = darwin.apple_sdk.frameworks.CoreFoundation;
DarwinTools = callPackage ../os-specific/darwin/DarwinTools { };