forked from mirrors/nixpkgs
update packages with new cf-private compatibility
This commit is contained in:
parent
5ea8770263
commit
2e29399993
pkgs
|
@ -14,12 +14,6 @@ stdenv.mkDerivation rec {
|
||||||
sha256 = "1m34s2hsc5lcish6gmvn2iwaz0k7jc3kg9q4nf30fj9inl7gaybs";
|
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;
|
enableParallelBuilding = true;
|
||||||
|
|
||||||
buildInputs = [ ncurses pkgconfig ]
|
buildInputs = [ ncurses pkgconfig ]
|
||||||
|
|
|
@ -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";
|
let version = "1.3.1";
|
||||||
in stdenv.mkDerivation {
|
in stdenv.mkDerivation {
|
||||||
|
@ -19,6 +19,8 @@ in stdenv.mkDerivation {
|
||||||
xorg.libXext
|
xorg.libXext
|
||||||
pixman
|
pixman
|
||||||
pkgconfig
|
pkgconfig
|
||||||
|
Foundation libobjc Xplugin
|
||||||
|
cf-private
|
||||||
];
|
];
|
||||||
meta = with lib; {
|
meta = with lib; {
|
||||||
license = licenses.apsl20;
|
license = licenses.apsl20;
|
||||||
|
|
|
@ -9434,7 +9434,12 @@ let
|
||||||
zookeeper_mt = callPackage ../development/libraries/zookeeper_mt { };
|
zookeeper_mt = callPackage ../development/libraries/zookeeper_mt { };
|
||||||
|
|
||||||
xquartz = callPackage ../servers/x11/xquartz { };
|
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 {
|
xorg = recurseIntoAttrs (lib.callPackagesWith pkgs ../servers/x11/xorg/default.nix {
|
||||||
inherit clangStdenv fetchurl fetchgit fetchpatch stdenv pkgconfig intltool freetype fontconfig
|
inherit clangStdenv fetchurl fetchgit fetchpatch stdenv pkgconfig intltool freetype fontconfig
|
||||||
|
|
Loading…
Reference in a new issue