Skip to content

Commit

Permalink
xvkbd: explicitly set LIBDIR and CONFDIR
Browse files Browse the repository at this point in the history
In preparation to fix long-standing `imake` bug NixOS#135337 we need
to set `LIBDIR` and `CONFDIR` away from incorrectly embedded
`xorg-cf-files`. Before NixOS#135337 the package worked by chance.

Issue: NixOS#135337
  • Loading branch information
trofi committed Sep 6, 2021
1 parent bace74b commit 7903120
Showing 1 changed file with 5 additions and 3 deletions.
8 changes: 5 additions & 3 deletions pkgs/tools/X11/xvkbd/default.nix
Expand Up @@ -13,9 +13,11 @@ stdenv.mkDerivation {
buildInputs = [ libXt libXaw libXtst xorgproto libXi Xaw3d libXpm ];
installTargets = [ "install" "install.man" ];
makeFlags = [
"BINDIR=$(out)/bin"
"XAPPLOADDIR=$(out)/etc/X11/app-defaults"
"MANPATH=$(out)/man"
"BINDIR=${placeholder "out"}/bin"
"CONFDIR=${placeholder "out"}/etc/X11"
"LIBDIR=${placeholder "out"}/lib/X11"
"XAPPLOADDIR=${placeholder "out"}/etc/X11/app-defaults"
"MANPATH=${placeholder "out"}/man"
];

meta = with lib; {
Expand Down

0 comments on commit 7903120

Please sign in to comment.