nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-22 06:53:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

xorg.libXpm: provide gzip path for cross

Browse Source 
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.
This commit is contained in:
Stefan Frijters 2024-09-16 01:52:35 +02:00 committed by Alyssa Ross
parent 1c3463dc7a
commit 4a16af92fe
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/servers/x11/xorg/overrides.nix
View File

@ -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"; };
});