b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

xvkbd: explicitly set LIBDIR and CONFDIR

Browse source 
In preparation to fix long-standing `imake` bug #135337 we need
to set `LIBDIR` and `CONFDIR` away from incorrectly embedded
`xorg-cf-files`. Before #135337 the package worked by chance.

Issue: https://github.com/NixOS/nixpkgs/issues/135337
This commit is contained in:
Sergei Trofimovich 2021-08-24 21:53:54 +01:00
parent bace74bbf8
commit 79031203b8
1 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
pkgs/tools/X11/xvkbd/default.nix
View file

@ -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; {