From 4a16af92feaed55170b20daff45e369c78237b66 Mon Sep 17 00:00:00 2001 From: Stefan Frijters Date: Mon, 16 Sep 2024 01:52:35 +0200 Subject: [PATCH] xorg.libXpm: provide gzip path for cross According to the manual, libXpm "deals with compressed files by forking an uncompress or gzip process" and "writes to a piped compress or gzip process". Before this commit a path to the host version of `uncompress` is provided, but the build picks up the build version of `gzip`, so the build doesn't fail, but it uses the wrong `gzip`. This commit adds the correct paths. --- pkgs/servers/x11/xorg/overrides.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix index b3eb0e74dc68..b4610bfbdcf6 100644 --- a/pkgs/servers/x11/xorg/overrides.nix +++ b/pkgs/servers/x11/xorg/overrides.nix @@ -1,6 +1,6 @@ { callPackage, lib, stdenv, makeWrapper, fetchurl, fetchpatch, fetchFromGitLab, buildPackages, - automake, autoconf, libiconv, libtool, intltool, gettext, python3, perl, + automake, autoconf, libiconv, libtool, intltool, gettext, gzip, python3, perl, freetype, tradcpp, fontconfig, meson, ninja, ed, fontforge, libGL, spice-protocol, zlib, libGLU, dbus, libunwind, libdrm, netbsd, ncompress, updateAutotoolsGnuConfigScriptsHook, @@ -397,6 +397,8 @@ self: super: outputs = [ "bin" "dev" "out" ]; # tiny man in $bin patchPhase = "sed -i '/USE_GETTEXT_TRUE/d' sxpm/Makefile.in cxpm/Makefile.in"; XPM_PATH_COMPRESS = lib.makeBinPath [ ncompress ]; + XPM_PATH_GZIP = lib.makeBinPath [ gzip ]; + XPM_PATH_UNCOMPRESS = lib.makeBinPath [ gzip ]; meta = attrs.meta // { mainProgram = "sxpm"; }; });