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

Fix xfontsel to find the app defaults file. 

svn path=/nixpkgs/trunk/; revision=34443
This commit is contained in:
Peter Simons 2012-06-11 07:16:51 +00:00
parent 7b14de6733
commit 84547c5307
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
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}: {stdenv, fetchurl, makeWrapper, libX11, pkgconfig, libXaw}:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "xfontsel-1.0.2"; name = "xfontsel-1.0.2";
@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
sha256 = "1a86a08sf0wjrki9ydh7hr5qf6hrixc4ljlxizakjzmx20wvlrks"; sha256 = "1a86a08sf0wjrki9ydh7hr5qf6hrixc4ljlxizakjzmx20wvlrks";
}; };
buildInputs = [libX11 pkgconfig libXaw]; buildInputs = [libX11 makeWrapper pkgconfig libXaw];
# Without this, it gets Xmu as a dependency, but without rpath entry # Without this, it gets Xmu as a dependency, but without rpath entry
NIX_LDFLAGS = "-lXmu"; NIX_LDFLAGS = "-lXmu";
@ -19,8 +19,10 @@ 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.
preInstall = '' installPhase = ''
installFlags="appdefaultdir=$out/share/X11/app-defaults" make install appdefaultdir=$out/share/X11/app-defaults
wrapProgram $out/bin/xfontsel \
--set XAPPLRESDIR $out/share/X11/app-defaults
''; '';
meta = { meta = {