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

give xquartz impure deps to make it build

This commit is contained in:
Jude Taylor 2015-09-28 14:45:45 -07:00
parent 41ef382b9b
commit 4f9ef9bbfb
4 changed files with 5 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,4 +1,4 @@
{ stdenv, lib, fetchurl, xorg, pixman, pkgconfig, Foundation, libobjc, Xplugin, CF }: { stdenv, lib, fetchurl, xorg, pixman, pkgconfig }:
let version = "1.3.1"; let version = "1.3.1";
in stdenv.mkDerivation { in stdenv.mkDerivation {
@ -19,11 +19,8 @@ in stdenv.mkDerivation {
xorg.libXext xorg.libXext
pixman pixman
pkgconfig pkgconfig
CF
Foundation
libobjc
Xplugin
]; ];
NIX_CFLAGS_COMPILE = "-F/System/Library/Frameworks -I/usr/include";
NIX_LDFLAGS = stdenv.lib.optional stdenv.isDarwin NIX_LDFLAGS = stdenv.lib.optional stdenv.isDarwin
"/System/Library/Frameworks/CoreFoundation.framework/Versions/A/CoreFoundation"; "/System/Library/Frameworks/CoreFoundation.framework/Versions/A/CoreFoundation";
meta = with lib; { meta = with lib; {

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

@ -326,8 +326,6 @@ in
} else { } else {
buildInputs = commonBuildInputs ++ [ buildInputs = commonBuildInputs ++ [
args.bootstrap_cmds args.automake args.autoconf args.bootstrap_cmds args.automake args.autoconf
args.CF args.apple_sdk.libs.Xplugin args.apple_sdk.frameworks.Foundation
args.libobjc args.apple_sdk.frameworks.Cocoa
]; ];
propagatedBuildInputs = commonPropagatedBuildInputs ++ [ propagatedBuildInputs = commonPropagatedBuildInputs ++ [
libAppleWM applewmproto libAppleWM applewmproto
@ -355,6 +353,9 @@ in
"--with-bundle-id-prefix=org.nixos.xquartz" "--with-bundle-id-prefix=org.nixos.xquartz"
"--with-sha1=CommonCrypto" "--with-sha1=CommonCrypto"
]; ];
__impureHostDeps = ["/System/Library" "/usr"];
NIX_CFLAGS_COMPILE = "-F/System/Library/Frameworks -I/usr/include";
NIX_CFLAGS_LINK = "-L/usr/lib";
preConfigure = '' preConfigure = ''
ensureDir $out/Applications ensureDir $out/Applications
export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -Wno-error" export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -Wno-error"

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

@ -146,13 +146,6 @@ in stdenv.mkDerivation {
--replace "@STARTX@" "$defaultStartX" \ --replace "@STARTX@" "$defaultStartX" \
--replace "@FONTCONFIG_FILE@" "$fontsConfPath" --replace "@FONTCONFIG_FILE@" "$fontsConfPath"
rm $out/lib/X11/xinit/privileged_startx.d/*
cp ${./privileged} $out/lib/X11/xinit/privileged_startx.d/privileged
substituteInPlace $out/lib/X11/xinit/privileged_startx.d/privileged \
--replace "@PATH@" "$out/bin:${env}" \
--replace "@FONTCONFIG_FILE@" "$fontsConfPath" \
--replace "@FONT_CACHE@" "$out/bin/font_cache"
cp ${./font_cache} $out/bin/font_cache cp ${./font_cache} $out/bin/font_cache
substituteInPlace $out/bin/font_cache \ substituteInPlace $out/bin/font_cache \
--replace "@PATH@" "$out/bin:${env}" \ --replace "@PATH@" "$out/bin:${env}" \

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

@ -9252,9 +9252,6 @@ let
xquartz = callPackage ../servers/x11/xquartz { }; xquartz = callPackage ../servers/x11/xquartz { };
quartz-wm = callPackage ../servers/x11/quartz-wm { quartz-wm = callPackage ../servers/x11/quartz-wm {
stdenv = clangStdenv; stdenv = clangStdenv;
inherit (darwin.apple_sdk.frameworks) Foundation;
inherit (darwin.apple_sdk.libs) Xplugin;
inherit (darwin) libobjc CF;
}; };
xorg = recurseIntoAttrs (lib.callPackagesWith pkgs ../servers/x11/xorg/default.nix { xorg = recurseIntoAttrs (lib.callPackagesWith pkgs ../servers/x11/xorg/default.nix {