Skip to content

Commit

Permalink
Bring Darwin frameworks and libs into scope in all packages by default
Browse files Browse the repository at this point in the history 
Create stub packages for Darwin to avoid evaluation failures.

This reverts commit c416c3a.
  • Loading branch information
Jude Taylor committed Oct 27, 2015
1 parent c416c3a commit 89c2e33
Showing 1 changed file with 27 additions and 53 deletions.
80 changes: 27 additions & 53 deletions pkgs/top-level/all-packages.nix
View file
Expand Up @@ -125,7 +125,16 @@ let
# The package compositions. Yes, this isn't properly indented.
pkgsFun = pkgs: overrides:
with helperFunctions;
let defaultScope = pkgs // pkgs.xorg; self = self_ // overrides;
let
darwinPkgNames = with pkgs.darwin;
builtins.attrNames (apple_sdk.frameworks // apple_sdk.libs // pkgs.darwin);
fakeDarwinPkgs = lib.genAttrs darwinPkgNames (x: null);
# on darwin, put os-specific packages first so they can be overridden by the ones
# defined here (e.g. libiconv)
defaultScope = (if pkgs.stdenv.isDarwin
then with pkgs.darwin; apple_sdk.frameworks // apple_sdk.libs // pkgs.darwin // pkgs // pkgs.xorg
else fakeDarwinPkgs) // pkgs // pkgs.xorg;
self = self_ // overrides;
self_ = with self; helperFunctions // {

# Make some arguments passed to all-packages.nix available
Expand Down Expand Up @@ -2050,7 +2059,6 @@ let

nodejs-0_10 = callPackage ../development/web/nodejs/v0_10.nix {
libtool = darwin.cctools;
inherit (darwin.apple_sdk.frameworks) CoreServices ApplicationServices Carbon Foundation;
};

nodejs = if stdenv.system == "armv5tel-linux" then
Expand Down Expand Up @@ -4073,13 +4081,9 @@ let

dotnetPackages = recurseIntoAttrs (callPackage ./dotnet-packages.nix {});

go_1_4 = callPackage ../development/compilers/go/1.4.nix {
inherit (darwin.apple_sdk.frameworks) Security;
};
go_1_4 = callPackage ../development/compilers/go/1.4.nix {};

go_1_5 = callPackage ../development/compilers/go/1.5.nix {
inherit (darwin.apple_sdk.frameworks) Security Foundation;
};
go_1_5 = callPackage ../development/compilers/go/1.5.nix {};

go = go_1_5;

Expand Down Expand Up @@ -5092,7 +5096,6 @@ let
};
python27 = callPackage ../development/interpreters/python/2.7 {
self = python27;
inherit (darwin) CF configd;
};
python32 = callPackage ../development/interpreters/python/3.2 {
self = python32;
Expand All @@ -5101,11 +5104,9 @@ let
self = python33;
};
python34 = hiPrio (callPackage ../development/interpreters/python/3.4 {
inherit (darwin) CF configd;
self = python34;
});
python35 = hiPrio (callPackage ../development/interpreters/python/3.5 {
inherit (darwin) CF configd;
self = python35;
});
pypy = callPackage ../development/interpreters/pypy {
Expand Down Expand Up @@ -6764,9 +6765,7 @@ let

kinetic-cpp-client = callPackage ../development/libraries/kinetic-cpp-client { };

krb5Full = callPackage ../development/libraries/kerberos/krb5.nix {
inherit (darwin) bootstrap_cmds;
};
krb5Full = callPackage ../development/libraries/kerberos/krb5.nix {};
libkrb5 = krb5Full.override { type = "lib"; };

LASzip = callPackage ../development/libraries/LASzip { };
Expand Down Expand Up @@ -6922,9 +6921,7 @@ let

libdc1394avt = callPackage ../development/libraries/libdc1394avt { };

libdevil = callPackage ../development/libraries/libdevil {
inherit (darwin.apple_sdk.frameworks) OpenGL;
};
libdevil = callPackage ../development/libraries/libdevil {};

libdevil-nox = libdevil.override {
libX11 = null;
Expand Down Expand Up @@ -7130,11 +7127,7 @@ let
libmsgpack = callPackage ../development/libraries/libmsgpack { };
libmsgpack_0_5 = callPackage ../development/libraries/libmsgpack/0.5.nix { };

libnatspec = callPackage ../development/libraries/libnatspec (
stdenv.lib.optionalAttrs stdenv.isDarwin {
inherit (darwin) libiconv;
}
);
libnatspec = callPackage ../development/libraries/libnatspec {};

libndp = callPackage ../development/libraries/libndp { };

Expand Down Expand Up @@ -7471,9 +7464,7 @@ let

libusb = callPackage ../development/libraries/libusb {};

libusb1 = callPackage ../development/libraries/libusb1 {
inherit (darwin) libobjc IOKit;
};
libusb1 = callPackage ../development/libraries/libusb1 {};

libusbmuxd = callPackage ../development/libraries/libusbmuxd { };

Expand All @@ -7483,7 +7474,6 @@ let

libuvVersions = recurseIntoAttrs (callPackage ../development/libraries/libuv {
automake = automake113x; # fails with 14
inherit (darwin.apple_sdk.frameworks) ApplicationServices CoreServices;
});

libuv = libuvVersions.v1_7_5;
Expand Down Expand Up @@ -9440,18 +9430,14 @@ let
xquartz = callPackage ../servers/x11/xquartz { };
quartz-wm = callPackage ../servers/x11/quartz-wm {
stdenv = clangStdenv;
inherit (darwin.apple_sdk.frameworks) Foundation;
inherit (darwin.apple_sdk.libs) Xplugin;
inherit (darwin) libobjc cf-private;
};

xorg = recurseIntoAttrs (lib.callPackagesWith pkgs ../servers/x11/xorg/default.nix {
inherit clangStdenv fetchurl fetchgit fetchpatch stdenv pkgconfig intltool freetype fontconfig
libxslt expat libpng zlib perl mesa_drivers spice_protocol libunwind
dbus libuuid openssl gperf m4 libevdev tradcpp libinput mcpp makeWrapper autoreconfHook
autoconf automake libtool xmlto asciidoc flex bison python mtdev pixman;
inherit (darwin) apple_sdk cf-private libobjc;
bootstrap_cmds = if stdenv.isDarwin then darwin.bootstrap_cmds else null;
inherit (darwin) apple_sdk bootstrap_cmds cf-private libobjc;
mesa = mesa_noglu;
udev = if stdenv.isLinux then udev else null;
libdrm = if stdenv.isLinux then libdrm else null;
Expand Down Expand Up @@ -9572,7 +9558,9 @@ let

darwin = let
cmdline = callPackage ../os-specific/darwin/command-line-tools {};
apple-source-releases = callPackage ../os-specific/darwin/apple-source-releases { };
apple-source-releases = import ../os-specific/darwin/apple-source-releases {
inherit stdenv fetchurl pkgs;
};
in apple-source-releases // rec {
cctools_cross = callPackage (forceNativeDrv (callPackage ../os-specific/darwin/cctools/port.nix {}).cross) {
cross = assert crossSystem != null; crossSystem;
Expand All @@ -9598,7 +9586,7 @@ let
osx_sdk = callPackage ../os-specific/darwin/osx-sdk {};
osx_private_sdk = callPackage ../os-specific/darwin/osx-private-sdk {};

security_tool = (newScope (darwin.apple_sdk.frameworks // darwin)) ../os-specific/darwin/security-tool {
security_tool = callPackage ../os-specific/darwin/security-tool {
Security-framework = darwin.apple_sdk.frameworks.Security;
};

Expand All @@ -9607,18 +9595,16 @@ let
cmdline_sdk = cmdline.sdk;
cmdline_tools = cmdline.tools;

apple_sdk = callPackage ../os-specific/darwin/apple-sdk {
apple_sdk = import ../os-specific/darwin/apple-sdk {
inherit stdenv fetchurl xar gzip cpio pkgs;
inherit (darwin) CF;
};

libobjc = apple-source-releases.objc4;
};

gnustep-make = callPackage ../development/tools/build-managers/gnustep/make {};
gnustep-xcode = callPackage ../development/tools/build-managers/gnustep/xcode {
inherit (darwin.apple_sdk.frameworks) Foundation;
inherit (darwin) libobjc;
};
gnustep-xcode = callPackage ../development/tools/build-managers/gnustep/xcode {};

devicemapper = lvm2;

Expand Down Expand Up @@ -11252,8 +11238,6 @@ let
imagemagick = null;
acl = null;
gpm = null;
inherit (darwin.apple_sdk.frameworks) AppKit Foundation;
inherit (darwin) libobjc;
};

emacs24-nox = lowPrio (appendToName "nox" (emacs24.override {
Expand All @@ -11268,9 +11252,8 @@ let
emacs24Macport_24_4 = lowPrio (callPackage ../applications/editors/emacs-24/macport-24.4.nix {
stdenv = pkgs.clangStdenv;
});
emacs24Macport_24_5 = lowPrio (newScope darwin.apple_sdk.frameworks ../applications/editors/emacs-24/macport-24.5.nix {
emacs24Macport_24_5 = lowPrio (callPackage ../applications/editors/emacs-24/macport-24.5.nix {
stdenv = pkgs.clangStdenv;
inherit (darwin) libobjc cf-private;
});
emacs24Macport = self.emacs24Macport_24_5;

Expand Down Expand Up @@ -12181,8 +12164,6 @@ let

mercurial = callPackage ../applications/version-management/mercurial {
inherit (pythonPackages) curses docutils hg-git dulwich;
inherit (darwin.apple_sdk.frameworks) ApplicationServices;
inherit (darwin) cf-private;
guiSupport = false; # use mercurialFull to get hgk GUI
};

Expand Down Expand Up @@ -13161,18 +13142,13 @@ let
flup = pythonPackages.flup;
};

vim = callPackage ../applications/editors/vim {
inherit (darwin.apple_sdk.frameworks) CoreServices Cocoa Foundation CoreData;
inherit (darwin) libobjc cf-private;
};
vim = callPackage ../applications/editors/vim {};

macvim = callPackage ../applications/editors/vim/macvim.nix { stdenv = clangStdenv; };

vimHugeX = vim_configurable;

vim_configurable = vimUtils.makeCustomizable (callPackage ../applications/editors/vim/configurable.nix {
inherit (darwin.apple_sdk.frameworks) CoreServices Cocoa Foundation CoreData;
inherit (darwin) libobjc cf-private;

features = "huge"; # one of tiny, small, normal, big or huge
lua = pkgs.lua5_1;
Expand Down Expand Up @@ -13271,9 +13247,7 @@ let
graphicsSupport = false;
};

weechat = callPackage ../applications/networking/irc/weechat {
inherit (darwin) libobjc;
};
weechat = callPackage ../applications/networking/irc/weechat {};

westonLite = callPackage ../applications/window-managers/weston {
pango = null;
Expand Down

0 comments on commit 89c2e33

Please sign in to comment.