diff options
| author | Peter Simons <simons@cryp.to> | 2012-06-11 07:16:51 +0000 |
|---|---|---|
| committer | Peter Simons <simons@cryp.to> | 2012-06-11 07:16:51 +0000 |
| commit | 84547c53077f70dd8b5efd5cad48094923c07d36 (patch) | |
| tree | a9a94a213a2bc35fc2fb2ab88bcf6e287e7fc25b /pkgs/applications/misc/xfontsel/default.nix | |
| parent | 7b14de6733af677acc51fa9181fde7a35ec83c36 (diff) | |
| download | nixpkgs-84547c53077f70dd8b5efd5cad48094923c07d36.tar nixpkgs-84547c53077f70dd8b5efd5cad48094923c07d36.tar.gz nixpkgs-84547c53077f70dd8b5efd5cad48094923c07d36.tar.bz2 nixpkgs-84547c53077f70dd8b5efd5cad48094923c07d36.tar.lz nixpkgs-84547c53077f70dd8b5efd5cad48094923c07d36.tar.xz nixpkgs-84547c53077f70dd8b5efd5cad48094923c07d36.tar.zst nixpkgs-84547c53077f70dd8b5efd5cad48094923c07d36.zip | |
Fix xfontsel to find the app defaults file.
svn path=/nixpkgs/trunk/; revision=34443
Diffstat (limited to 'pkgs/applications/misc/xfontsel/default.nix')
| -rw-r--r-- | pkgs/applications/misc/xfontsel/default.nix | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/pkgs/applications/misc/xfontsel/default.nix b/pkgs/applications/misc/xfontsel/default.nix index c81a346914c..3179e1f3440 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}: +{stdenv, fetchurl, makeWrapper, libX11, pkgconfig, libXaw}: stdenv.mkDerivation rec { name = "xfontsel-1.0.2"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "1a86a08sf0wjrki9ydh7hr5qf6hrixc4ljlxizakjzmx20wvlrks"; }; - buildInputs = [libX11 pkgconfig libXaw]; + buildInputs = [libX11 makeWrapper pkgconfig libXaw]; # Without this, it gets Xmu as a dependency, but without rpath entry NIX_LDFLAGS = "-lXmu"; @@ -19,8 +19,10 @@ 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. - preInstall = '' - installFlags="appdefaultdir=$out/share/X11/app-defaults" + installPhase = '' + make install appdefaultdir=$out/share/X11/app-defaults + wrapProgram $out/bin/xfontsel \ + --set XAPPLRESDIR $out/share/X11/app-defaults ''; meta = { |