JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update packages with new cf-private compatibility

Browse Source
This commit is contained in:
Jude Taylor 2015-10-26 17:13:08 -07:00
parent 5ea8770263
commit 2e29399993
3 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -14,12 +14,6 @@ stdenv.mkDerivation rec {
sha256 = "1m34s2hsc5lcish6gmvn2iwaz0k7jc3kg9q4nf30fj9inl7gaybs";
};
# this makes maintainers very sad
# open source CF doesn't have anything NSArray-related, causing linking errors. the
# missing symbol is in system CoreFoundation.
NIX_LDFLAGS = stdenv.lib.optional stdenv.isDarwin
"/System/Library/Frameworks/CoreFoundation.framework/Versions/A/CoreFoundation";
enableParallelBuilding = true;
buildInputs = [ ncurses pkgconfig ]

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

@ -1,4 +1,4 @@
{ stdenv, lib, fetchurl, xorg, pixman, pkgconfig }:
{ stdenv, lib, fetchurl, xorg, pixman, pkgconfig, Foundation, libobjc, Xplugin, cf-private }:
let version = "1.3.1";
in stdenv.mkDerivation {
@ -19,6 +19,8 @@ in stdenv.mkDerivation {
xorg.libXext
pixman
pkgconfig
Foundation libobjc Xplugin
cf-private
];
meta = with lib; {
license = licenses.apsl20;

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

@ -9434,7 +9434,12 @@ let
zookeeper_mt = callPackage ../development/libraries/zookeeper_mt { };
xquartz = callPackage ../servers/x11/xquartz { };
quartz-wm = callPackage ../servers/x11/quartz-wm { stdenv = clangStdenv; };
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