diff options
| author | William A. Kennington III <william@wkennington.com> | 2015-11-13 15:53:10 -0800 |
|---|---|---|
| committer | William A. Kennington III <william@wkennington.com> | 2015-11-13 15:53:10 -0800 |
| commit | 9579c9ec7f53be31efba3803bd86661b59b0bb81 (patch) | |
| tree | e9e9ec19c0989f18d96ec0b8c6faf3780eb3dfb1 /pkgs/servers/x11 | |
| parent | 83aeb00a78ebca04bd6a42721284cad87da9fabe (diff) | |
| parent | cb21b77ff1b9ed006d1180ad7c94b2ee7ed3c096 (diff) | |
| download | nixlib-9579c9ec7f53be31efba3803bd86661b59b0bb81.tar nixlib-9579c9ec7f53be31efba3803bd86661b59b0bb81.tar.gz nixlib-9579c9ec7f53be31efba3803bd86661b59b0bb81.tar.bz2 nixlib-9579c9ec7f53be31efba3803bd86661b59b0bb81.tar.lz nixlib-9579c9ec7f53be31efba3803bd86661b59b0bb81.tar.xz nixlib-9579c9ec7f53be31efba3803bd86661b59b0bb81.tar.zst nixlib-9579c9ec7f53be31efba3803bd86661b59b0bb81.zip | |
Merge commit 'cb21b77' into master.upstream
This is a partial merge of staging for builds which are working
Diffstat (limited to 'pkgs/servers/x11')
| -rw-r--r-- | pkgs/servers/x11/quartz-wm/default.nix | 3 | ||||
| -rw-r--r-- | pkgs/servers/x11/xorg/overrides.nix | 3 | ||||
| -rw-r--r-- | pkgs/servers/x11/xquartz/default.nix | 3 |
3 files changed, 7 insertions, 2 deletions
diff --git a/pkgs/servers/x11/quartz-wm/default.nix b/pkgs/servers/x11/quartz-wm/default.nix index 5c9fe74b2ede..45e4df2bb8b9 100644 --- a/pkgs/servers/x11/quartz-wm/default.nix +++ b/pkgs/servers/x11/quartz-wm/default.nix @@ -21,6 +21,9 @@ in stdenv.mkDerivation { pkgconfig AppKit Xplugin ]; + NIX_CFLAGS_COMPILE = "-F/System/Library/Frameworks -I/usr/include"; + NIX_LDFLAGS = stdenv.lib.optional stdenv.isDarwin + "/System/Library/Frameworks/CoreFoundation.framework/Versions/A/CoreFoundation"; meta = with lib; { license = licenses.apsl20; platforms = platforms.darwin; diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix index 1ef67a1aa8e5..1339e51eb232 100644 --- a/pkgs/servers/x11/xorg/overrides.nix +++ b/pkgs/servers/x11/xorg/overrides.nix @@ -360,6 +360,9 @@ in "--with-bundle-id-prefix=org.nixos.xquartz" "--with-sha1=CommonCrypto" ]; + __impureHostDeps = ["/System/Library" "/usr"]; + NIX_CFLAGS_COMPILE = "-F/System/Library/Frameworks -I/usr/include"; + NIX_CFLAGS_LINK = "-L/usr/lib"; preConfigure = '' ensureDir $out/Applications export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -Wno-error" diff --git a/pkgs/servers/x11/xquartz/default.nix b/pkgs/servers/x11/xquartz/default.nix index cb84111c2c24..920b66147f26 100644 --- a/pkgs/servers/x11/xquartz/default.nix +++ b/pkgs/servers/x11/xquartz/default.nix @@ -109,8 +109,7 @@ in stdenv.mkDerivation { cp ${installer} $out/bin/xquartz-install - rm -rf $out/LaunchAgents - rm -rf $out/LaunchDaemons + rm -rf $out/LaunchAgents $out/LaunchDaemons fontsConfPath=$out/etc/X11/fonts.conf cp ${fontsConf} $fontsConfPath |