ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-09-20 12:08:17 +03:00
Code Issues Projects Releases Wiki Activity

Merge pull request #3658 from cstrahan/xquartz-cleanup

Browse Source 
Remove old comment, and delete confusing LaunchDaemon
This commit is contained in:
John Wiegley 2014-08-18 16:17:23 -05:00
commit 8b13100710
2 changed files with 1 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
pkgs/servers/x11/xorg/default.nix
View File

@ -1984,21 +1984,6 @@ let
buildInputs = [pkgconfig renderproto libdrm openssl libX11 libXau libXaw libXdmcp libXfixes libxkbfile libXmu libXpm libXrender libXres libXt libXv ];
}) // {inherit renderproto libdrm openssl libX11 libXau libXaw libXdmcp libXfixes libxkbfile libXmu libXpm libXrender libXres libXt libXv ;};
# TODO:
# With the current state of ./generate-expr-from-tarballs.pl,
# this will get overwritten when next invoked.
# Could add a special case to ./generate-expr-from-tarballs.pl,
# or perhaps there's a cleaner solution.
#xquartz = (mkDerivation "xquartz" {
# name = "xorg-server-1.14.6";
# builder = ./builder.sh;
# src = fetchurl {
# url = mirror://xorg/individual/xserver/xorg-server-1.14.6.tar.bz2;
# sha256 = "0c57vp1z0p38dj5gfipkmlw6bvbz1mrr0sb3sbghdxxdyq4kzcz8";
# };
# buildInputs = [pkgconfig renderproto libdrm openssl libX11 libXau libXaw libXdmcp libXfixes libxkbfile libXmu libXpm libXrender libXres libXt libXv ];
#}) // {inherit renderproto libdrm openssl libX11 libXau libXaw libXdmcp libXfixes libxkbfile libXmu libXpm libXrender libXres libXt libXv ;};
xorgsgmldoctools = (mkDerivation "xorgsgmldoctools" {
name = "xorg-sgml-doctools-1.11";
builder = ./builder.sh;

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

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