diff options
| author | John Wiegley <johnw@newartisans.com> | 2014-08-18 16:17:23 -0500 |
|---|---|---|
| committer | John Wiegley <johnw@newartisans.com> | 2014-08-18 16:17:23 -0500 |
| commit | 8b131007107e6929d780166f8030cb903b298244 (patch) | |
| tree | 92722c110c1d1c3ec1ed0593bbc1b3d51e110e21 /pkgs/servers | |
| parent | 2e2d3f32bdc41fd8237c8a556a4250875706ae7d (diff) | |
| parent | 6f2bd70fd015436eb3ea3ff118aedfe8b4975284 (diff) | |
| download | nixpkgs-8b131007107e6929d780166f8030cb903b298244.tar nixpkgs-8b131007107e6929d780166f8030cb903b298244.tar.gz nixpkgs-8b131007107e6929d780166f8030cb903b298244.tar.bz2 nixpkgs-8b131007107e6929d780166f8030cb903b298244.tar.lz nixpkgs-8b131007107e6929d780166f8030cb903b298244.tar.xz nixpkgs-8b131007107e6929d780166f8030cb903b298244.tar.zst nixpkgs-8b131007107e6929d780166f8030cb903b298244.zip | |
Merge pull request #3658 from cstrahan/xquartz-cleanup
Remove old comment, and delete confusing LaunchDaemon
Diffstat (limited to 'pkgs/servers')
| -rw-r--r-- | pkgs/servers/x11/xorg/default.nix | 15 | ||||
| -rw-r--r-- | pkgs/servers/x11/xquartz/default.nix | 1 |
2 files changed, 1 insertions, 15 deletions
diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix index 806cbf01b85..6945d6559fb 100644 --- a/pkgs/servers/x11/xorg/default.nix +++ b/pkgs/servers/x11/xorg/default.nix @@ -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; diff --git a/pkgs/servers/x11/xquartz/default.nix b/pkgs/servers/x11/xquartz/default.nix index abcae211f42..98fe2a51cc2 100644 --- a/pkgs/servers/x11/xquartz/default.nix +++ b/pkgs/servers/x11/xquartz/default.nix @@ -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 |