diff options
| author | Jude Taylor <me@jude.bio> | 2015-09-22 16:26:48 -0700 |
|---|---|---|
| committer | Jude Taylor <me@jude.bio> | 2015-09-22 16:27:51 -0700 |
| commit | 76a65398292d925e64a784ff1ebc441804dea9a8 (patch) | |
| tree | 5b29670ca83929bd5e1fac5109dc2efdb805c109 /pkgs/servers | |
| parent | 724e243159e4e0059699eb21f6761a760b9a2f49 (diff) | |
| download | nixlib-76a65398292d925e64a784ff1ebc441804dea9a8.tar nixlib-76a65398292d925e64a784ff1ebc441804dea9a8.tar.gz nixlib-76a65398292d925e64a784ff1ebc441804dea9a8.tar.bz2 nixlib-76a65398292d925e64a784ff1ebc441804dea9a8.tar.lz nixlib-76a65398292d925e64a784ff1ebc441804dea9a8.tar.xz nixlib-76a65398292d925e64a784ff1ebc441804dea9a8.tar.zst nixlib-76a65398292d925e64a784ff1ebc441804dea9a8.zip | |
work on making xquartz buildable in a pure environment
Diffstat (limited to 'pkgs/servers')
| -rw-r--r-- | pkgs/servers/x11/quartz-wm/default.nix | 8 | ||||
| -rw-r--r-- | pkgs/servers/x11/xorg/overrides.nix | 6 | ||||
| -rw-r--r-- | pkgs/servers/x11/xquartz/default.nix | 3 |
3 files changed, 13 insertions, 4 deletions
diff --git a/pkgs/servers/x11/quartz-wm/default.nix b/pkgs/servers/x11/quartz-wm/default.nix index 8f5885a48565..ff125067305a 100644 --- a/pkgs/servers/x11/quartz-wm/default.nix +++ b/pkgs/servers/x11/quartz-wm/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, xorg, pixman, pkgconfig }: +{ stdenv, lib, fetchurl, xorg, pixman, pkgconfig, Foundation, libobjc, Xplugin, CF }: let version = "1.3.1"; in stdenv.mkDerivation { @@ -19,7 +19,13 @@ in stdenv.mkDerivation { xorg.libXext pixman pkgconfig + CF + Foundation + libobjc + Xplugin ]; + 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 a7e5b43689a0..f5d5bf679ec6 100644 --- a/pkgs/servers/x11/xorg/overrides.nix +++ b/pkgs/servers/x11/xorg/overrides.nix @@ -324,7 +324,11 @@ in ''; passthru.version = version; # needed by virtualbox guest additions } else { - buildInputs = commonBuildInputs ++ [ args.bootstrap_cmds args.automake args.autoconf ]; + buildInputs = commonBuildInputs ++ [ + 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 ++ [ libAppleWM applewmproto ]; diff --git a/pkgs/servers/x11/xquartz/default.nix b/pkgs/servers/x11/xquartz/default.nix index 3e9e7cb779ee..8b5b3155a172 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 -r $out/LaunchAgents - rm -r $out/LaunchDaemons + rm -rf $out/LaunchAgents $out/LaunchDaemons fontsConfPath=$out/etc/X11/fonts.conf cp ${fontsConf} $fontsConfPath |