diff options
| author | Luke Granger-Brown <git@lukegb.com> | 2021-09-08 23:16:41 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-09-08 23:16:41 +0100 |
| commit | 764a52ba7ede76f29ce02290c41a88f6f1e2dfae (patch) | |
| tree | 5302e394630bc9afafde66f698a644f874321e08 /pkgs/tools/X11 | |
| parent | 31efc58eb070fb18b68a75ee2724172788c01b78 (diff) | |
| parent | 6073831a11510127a41ff2478abd799f0965e2f4 (diff) | |
Merge pull request #135414 from trofi/fix-imake-vendor
imake: do not skip Linux* vendor definitions
Diffstat (limited to 'pkgs/tools/X11')
| -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; { |