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

Cleaning the xfontsel expression a bit - I did not want to commit such amount of superfluous

Browse Source 
words in it, in the recent commit.


svn path=/nixpkgs/trunk/; revision=19093
This commit is contained in:
Lluís Batlle i Rossell 2009-12-24 14:55:11 +00:00
parent 5a4f1b07f4
commit 4354cf8a6b
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/applications/misc/xfontsel/default.nix
View File

@ -2,7 +2,7 @@
# at http://www.x.org/releases/individual/. # at http://www.x.org/releases/individual/.
# That is why this expression is not inside pkgs.xorg # 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 { stdenv.mkDerivation rec {
name = "xfontsel-1.0.2"; 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 # This will not make xfontsel find its app-defaults, but at least the $out
# directory will contain them. # directory will contain them.
# hack: Copying the XFontSel app-defaults file to $HOME makes xfontsel work. # hack: Copying the XFontSel app-defaults file to $HOME makes xfontsel work.
patchPhase = '' preInstall = ''
sed -i 's@^appdefaultdir=.*@appdefaultdir='$out/share/X11/app-defaults@ configure installFlags="appdefaultdir=$out/share/X11/app-defaults"
''; '';
} }

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

@ -6733,8 +6733,7 @@ let
xfontsel = import ../applications/misc/xfontsel { xfontsel = import ../applications/misc/xfontsel {
inherit fetchurl stdenv pkgconfig; inherit fetchurl stdenv pkgconfig;
inherit (xlibs) libX11 libXi imake libXau libXaw; inherit (xlibs) libX11 libXaw;
inherit (xorg) xauth;
}; };
fspot = import ../applications/graphics/f-spot { fspot = import ../applications/graphics/f-spot {