diff options
| author | Jude Taylor <me@jude.bio> | 2015-10-26 18:37:05 -0700 |
|---|---|---|
| committer | Jude Taylor <me@jude.bio> | 2015-10-26 18:37:05 -0700 |
| commit | 5469e9c581692b623f3d0b10ef951e6dde877ab0 (patch) | |
| tree | fc12a3237bdd6e5ad3e7bc939db5383b34a1c4fd /pkgs/servers | |
| parent | cf12f3e4d21141484206a506fcf41b0df76f75de (diff) | |
| download | nixlib-5469e9c581692b623f3d0b10ef951e6dde877ab0.tar nixlib-5469e9c581692b623f3d0b10ef951e6dde877ab0.tar.gz nixlib-5469e9c581692b623f3d0b10ef951e6dde877ab0.tar.bz2 nixlib-5469e9c581692b623f3d0b10ef951e6dde877ab0.tar.lz nixlib-5469e9c581692b623f3d0b10ef951e6dde877ab0.tar.xz nixlib-5469e9c581692b623f3d0b10ef951e6dde877ab0.tar.zst nixlib-5469e9c581692b623f3d0b10ef951e6dde877ab0.zip | |
fix xquartz build
Diffstat (limited to 'pkgs/servers')
| -rw-r--r-- | pkgs/servers/x11/quartz-wm/default.nix | 3 | ||||
| -rw-r--r-- | pkgs/servers/x11/xorg/overrides.nix | 11 | ||||
| -rw-r--r-- | pkgs/servers/x11/xquartz/default.nix | 6 |
3 files changed, 14 insertions, 6 deletions
diff --git a/pkgs/servers/x11/quartz-wm/default.nix b/pkgs/servers/x11/quartz-wm/default.nix index 6ddf60442786..81c63d9d68d5 100644 --- a/pkgs/servers/x11/quartz-wm/default.nix +++ b/pkgs/servers/x11/quartz-wm/default.nix @@ -19,8 +19,7 @@ in stdenv.mkDerivation { xorg.libXext pixman pkgconfig - Foundation libobjc Xplugin - cf-private + Foundation libobjc Xplugin cf-private ]; meta = with lib; { license = licenses.apsl20; diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix index 6d0e52084801..a77b7d4439f2 100644 --- a/pkgs/servers/x11/xorg/overrides.nix +++ b/pkgs/servers/x11/xorg/overrides.nix @@ -327,7 +327,15 @@ 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.apple_sdk.libs.Xplugin + args.apple_sdk.frameworks.Carbon + args.apple_sdk.frameworks.Cocoa + args.apple_sdk.frameworks.CoreGraphics + args.apple_sdk.frameworks.Foundation + args.cf-private args.libobjc + ]; propagatedBuildInputs = commonPropagatedBuildInputs ++ [ libAppleWM applewmproto ]; @@ -357,6 +365,7 @@ in preConfigure = '' ensureDir $out/Applications export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -Wno-error" + substituteInPlace hw/xquartz/pbproxy/Makefile.in --replace -F/System -F${args.apple_sdk.frameworks.ApplicationServices} ''; postInstall = '' rm -fr $out/share/X11/xkb/compiled diff --git a/pkgs/servers/x11/xquartz/default.nix b/pkgs/servers/x11/xquartz/default.nix index 3e9e7cb779ee..cb84111c2c24 100644 --- a/pkgs/servers/x11/xquartz/default.nix +++ b/pkgs/servers/x11/xquartz/default.nix @@ -109,8 +109,8 @@ in stdenv.mkDerivation { cp ${installer} $out/bin/xquartz-install - rm -r $out/LaunchAgents - rm -r $out/LaunchDaemons + rm -rf $out/LaunchAgents + rm -rf $out/LaunchDaemons fontsConfPath=$out/etc/X11/fonts.conf cp ${fontsConf} $fontsConfPath @@ -147,7 +147,7 @@ in stdenv.mkDerivation { --replace "@STARTX@" "$defaultStartX" \ --replace "@FONTCONFIG_FILE@" "$fontsConfPath" - rm $out/lib/X11/xinit/privileged_startx.d/* + mkdir -p $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}" \ |