public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

work on making xquartz buildable in a pure environment

Browse Source
This commit is contained in:
Jude Taylor 2015-09-22 16:26:48 -07:00
parent 724e243159
commit 76a6539829
4 changed files with 20 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkgs/servers/x11/quartz-wm/default.nix
View File

@ -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"; let version = "1.3.1";
in stdenv.mkDerivation { in stdenv.mkDerivation {
@ -19,7 +19,13 @@ in stdenv.mkDerivation {
xorg.libXext xorg.libXext
pixman pixman
pkgconfig pkgconfig
CF
Foundation
libobjc
Xplugin
]; ];
NIX_LDFLAGS = stdenv.lib.optional stdenv.isDarwin
"/System/Library/Frameworks/CoreFoundation.framework/Versions/A/CoreFoundation";
meta = with lib; { meta = with lib; {
license = licenses.apsl20; license = licenses.apsl20;
platforms = platforms.darwin; platforms = platforms.darwin;

6
pkgs/servers/x11/xorg/overrides.nix
View File

@ -324,7 +324,11 @@ 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.CF args.apple_sdk.libs.Xplugin args.apple_sdk.frameworks.Foundation
args.libobjc args.apple_sdk.frameworks.Cocoa
];
propagatedBuildInputs = commonPropagatedBuildInputs ++ [ propagatedBuildInputs = commonPropagatedBuildInputs ++ [
libAppleWM applewmproto libAppleWM applewmproto
]; ];

3
pkgs/servers/x11/xquartz/default.nix
View File

@ -109,8 +109,7 @@ in stdenv.mkDerivation {
cp ${installer} $out/bin/xquartz-install cp ${installer} $out/bin/xquartz-install
rm -r $out/LaunchAgents rm -rf $out/LaunchAgents $out/LaunchDaemons
rm -r $out/LaunchDaemons
fontsConfPath=$out/etc/X11/fonts.conf fontsConfPath=$out/etc/X11/fonts.conf
cp ${fontsConf} $fontsConfPath cp ${fontsConf} $fontsConfPath

9
pkgs/top-level/all-packages.nix
View File

@ -9246,14 +9246,19 @@ let
zookeeper_mt = callPackage ../development/libraries/zookeeper_mt { }; zookeeper_mt = callPackage ../development/libraries/zookeeper_mt { };
xquartz = callPackage ../servers/x11/xquartz { }; xquartz = callPackage ../servers/x11/xquartz { };
quartz-wm = callPackage ../servers/x11/quartz-wm { stdenv = clangStdenv; }; quartz-wm = callPackage ../servers/x11/quartz-wm {
stdenv = clangStdenv;
inherit (darwin.apple_sdk.frameworks) Foundation;
inherit (darwin.apple_sdk.libs) Xplugin;
inherit (darwin) libobjc CF;
};
xorg = recurseIntoAttrs (lib.callPackagesWith pkgs ../servers/x11/xorg/default.nix { xorg = recurseIntoAttrs (lib.callPackagesWith pkgs ../servers/x11/xorg/default.nix {
inherit clangStdenv fetchurl fetchgit fetchpatch stdenv pkgconfig intltool freetype fontconfig inherit clangStdenv fetchurl fetchgit fetchpatch stdenv pkgconfig intltool freetype fontconfig
libxslt expat libpng zlib perl mesa_drivers spice_protocol libxslt expat libpng zlib perl mesa_drivers spice_protocol
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 libobjc CF;
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;