From bace74bbf8e9bac15802c5382d7e46fd26be72ba Mon Sep 17 00:00:00 2001
From: Sergei Trofimovich <slyich@gmail.com>
Date: Tue, 24 Aug 2021 21:51:28 +0100
Subject: [PATCH] xcruiser: 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
---
pkgs/applications/misc/xcruiser/default.nix | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/pkgs/applications/misc/xcruiser/default.nix b/pkgs/applications/misc/xcruiser/default.nix
index 2e4771563a04..db7fe260b924 100644
--- a/pkgs/applications/misc/xcruiser/default.nix
+++ b/pkgs/applications/misc/xcruiser/default.nix
@@ -12,8 +12,10 @@ stdenv.mkDerivation {
buildInputs = [ libXt libXaw libXpm libXext ];
makeFlags = [
- "BINDIR=$(out)/bin"
- "XAPPLOADDIR=$(out)/etc/X11/app-defaults"
+ "BINDIR=${placeholder "out"}/bin"
+ "CONFDIR=${placeholder "out"}/etc/X11"
+ "LIBDIR=${placeholder "out"}/lib/X11"
+ "XAPPLOADDIR=${placeholder "out"}/etc/X11/app-defaults"
];
meta = with lib; {