From 4354cf8a6b67f6d6e0f09bd3f054b6416f1d0cf9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
 <viric@vicerveza.homeunix.net>
Date: Thu, 24 Dec 2009 14:55:11 +0000
Subject: [PATCH] Cleaning the xfontsel expression a bit - I did not want to
 commit such amount of superfluous words in it, in the recent commit.

svn path=/nixpkgs/trunk/; revision=19093
---
 pkgs/applications/misc/xfontsel/default.nix | 6 +++---
 pkgs/top-level/all-packages.nix             | 3 +--
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/misc/xfontsel/default.nix b/pkgs/applications/misc/xfontsel/default.nix
index 222d8c412ce..7b8f4ae914b 100644
--- a/pkgs/applications/misc/xfontsel/default.nix
+++ b/pkgs/applications/misc/xfontsel/default.nix
@@ -2,7 +2,7 @@
 # at http://www.x.org/releases/individual/.
 # That is why this expression is not inside pkgs.xorg
 
-{stdenv, fetchurl, libX11, pkgconfig, libXaw, libXi, imake, xauth, libXau}:
+{stdenv, fetchurl, libX11, pkgconfig, libXaw}:
 stdenv.mkDerivation rec {
   name = "xfontsel-1.0.2";
 
@@ -16,8 +16,8 @@ stdenv.mkDerivation rec {
   # This will not make xfontsel find its app-defaults, but at least the $out
   # directory will contain them.
   # hack: Copying the XFontSel app-defaults file to $HOME makes xfontsel work.
-  patchPhase = ''
-    sed -i 's@^appdefaultdir=.*@appdefaultdir='$out/share/X11/app-defaults@ configure
+  preInstall = ''
+    installFlags="appdefaultdir=$out/share/X11/app-defaults"
   '';
 }
 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 5e4b937cc65..c74e7da3ba4 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6733,8 +6733,7 @@ let
 
   xfontsel = import ../applications/misc/xfontsel {
     inherit fetchurl stdenv pkgconfig;
-    inherit (xlibs) libX11 libXi imake libXau libXaw;
-    inherit (xorg) xauth;
+    inherit (xlibs) libX11 libXaw;
   };
 
   fspot = import ../applications/graphics/f-spot {