From 5469e9c581692b623f3d0b10ef951e6dde877ab0 Mon Sep 17 00:00:00 2001 From: Jude Taylor <me@jude.bio> Date: Mon, 26 Oct 2015 18:37:05 -0700 Subject: [PATCH] fix xquartz build --- pkgs/servers/x11/quartz-wm/default.nix | 3 +-- pkgs/servers/x11/xorg/overrides.nix | 11 ++++++++++- pkgs/servers/x11/xquartz/default.nix | 6 +++--- pkgs/top-level/all-packages.nix | 2 +- 4 files changed, 15 insertions(+), 7 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}" \ diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 28f0d5c8f1ee..ca4a69b60330 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9446,7 +9446,7 @@ let libxslt expat libpng zlib perl mesa_drivers spice_protocol libunwind dbus libuuid openssl gperf m4 libevdev tradcpp libinput mcpp makeWrapper autoreconfHook autoconf automake libtool xmlto asciidoc flex bison python mtdev pixman; - inherit (darwin) apple_sdk; + inherit (darwin) apple_sdk cf-private libobjc; bootstrap_cmds = if stdenv.isDarwin then darwin.bootstrap_cmds else null; mesa = mesa_noglu; udev = if stdenv.isLinux then udev else null;