Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix xfontsel to find the app defaults file. #7

Closed
wants to merge 1 commit into from
Closed
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 6 additions & 4 deletions pkgs/applications/misc/xfontsel/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -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";

Expand All @@ -11,16 +11,18 @@ 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";

# 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 = {
Expand Down