diff options
| author | Sergei Trofimovich <slyich@gmail.com> | 2021-08-24 21:53:54 +0100 |
|---|---|---|
| committer | Sergei Trofimovich <slyich@gmail.com> | 2021-09-06 07:46:13 +0100 |
| commit | 79031203b88f8b96b1321416f59e23481cceed45 (patch) | |
| tree | 46722c997a4d8a867d58c1036690ac1f6fcf014d /pkgs/tools/X11/xvkbd | |
| parent | bace74bbf8e9bac15802c5382d7e46fd26be72ba (diff) | |
xvkbd: explicitly set LIBDIR and CONFDIR
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
Diffstat (limited to 'pkgs/tools/X11/xvkbd')
| -rw-r--r-- | pkgs/tools/X11/xvkbd/default.nix | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/pkgs/tools/X11/xvkbd/default.nix b/pkgs/tools/X11/xvkbd/default.nix index 05936d1d1f3da..d751cb8f087a7 100644 --- a/pkgs/tools/X11/xvkbd/default.nix +++ b/pkgs/tools/X11/xvkbd/default.nix @@ -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; { |