3
0
Fork 0
forked from mirrors/nixpkgs

fix xquartz build

This commit is contained in:
Jude Taylor 2015-10-26 18:37:05 -07:00
parent cf12f3e4d2
commit 5469e9c581
4 changed files with 15 additions and 7 deletions
pkgs
servers/x11
top-level

View file

@ -19,8 +19,7 @@ in stdenv.mkDerivation {
xorg.libXext xorg.libXext
pixman pixman
pkgconfig pkgconfig
Foundation libobjc Xplugin Foundation libobjc Xplugin cf-private
cf-private
]; ];
meta = with lib; { meta = with lib; {
license = licenses.apsl20; license = licenses.apsl20;

View file

@ -327,7 +327,15 @@ in
''; '';
passthru.version = version; # needed by virtualbox guest additions passthru.version = version; # needed by virtualbox guest additions
} else { } 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 ++ [ propagatedBuildInputs = commonPropagatedBuildInputs ++ [
libAppleWM applewmproto libAppleWM applewmproto
]; ];
@ -357,6 +365,7 @@ in
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"
substituteInPlace hw/xquartz/pbproxy/Makefile.in --replace -F/System -F${args.apple_sdk.frameworks.ApplicationServices}
''; '';
postInstall = '' postInstall = ''
rm -fr $out/share/X11/xkb/compiled rm -fr $out/share/X11/xkb/compiled

View file

@ -109,8 +109,8 @@ in stdenv.mkDerivation {
cp ${installer} $out/bin/xquartz-install cp ${installer} $out/bin/xquartz-install
rm -r $out/LaunchAgents rm -rf $out/LaunchAgents
rm -r $out/LaunchDaemons rm -rf $out/LaunchDaemons
fontsConfPath=$out/etc/X11/fonts.conf fontsConfPath=$out/etc/X11/fonts.conf
cp ${fontsConf} $fontsConfPath cp ${fontsConf} $fontsConfPath
@ -147,7 +147,7 @@ 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/* mkdir -p $out/lib/X11/xinit/privileged_startx.d
cp ${./privileged} $out/lib/X11/xinit/privileged_startx.d/privileged cp ${./privileged} $out/lib/X11/xinit/privileged_startx.d/privileged
substituteInPlace $out/lib/X11/xinit/privileged_startx.d/privileged \ substituteInPlace $out/lib/X11/xinit/privileged_startx.d/privileged \
--replace "@PATH@" "$out/bin:${env}" \ --replace "@PATH@" "$out/bin:${env}" \

View file

@ -9446,7 +9446,7 @@ let
libxslt expat libpng zlib perl mesa_drivers spice_protocol libunwind libxslt expat libpng zlib perl mesa_drivers spice_protocol libunwind
dbus libuuid openssl gperf m4 libevdev tradcpp libinput mcpp makeWrapper autoreconfHook dbus libuuid openssl gperf m4 libevdev tradcpp libinput mcpp makeWrapper autoreconfHook
autoconf automake libtool xmlto asciidoc flex bison python mtdev pixman; 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; bootstrap_cmds = if stdenv.isDarwin then darwin.bootstrap_cmds else null;
mesa = mesa_noglu; mesa = mesa_noglu;
udev = if stdenv.isLinux then udev else null; udev = if stdenv.isLinux then udev else null;