Merge pull request #275755 from uninsane/pr-cross-argyllcms

argyllcms: support cross compilation
This commit is contained in:
Rick van Schijndel 2024-02-13 16:08:35 +01:00 committed by GitHub
commit dabc3e0a03
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 31 additions and 1 deletions

View file

@ -1,7 +1,7 @@
{ stdenv, fetchzip, jam, unzip, libX11, libXxf86vm, libXrandr, libXinerama
, libXrender, libXext, libtiff, libjpeg, libpng, libXScrnSaver, writeText
, libXdmcp, libXau, lib, openssl
, writeScript
, buildPackages, substituteAll, writeScript
}:
stdenv.mkDerivation rec {
@ -17,6 +17,14 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ jam unzip ];
patches = lib.optional (!stdenv.buildPlatform.canExecute stdenv.hostPlatform) (
# Build process generates files by compiling and then invoking an executable.
substituteAll {
src = ./jam-cross.patch;
emulator = stdenv.hostPlatform.emulator buildPackages;
}
);
postPatch = lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform) ''
substituteInPlace Jambase \
--replace "-m64" ""

View file

@ -0,0 +1,22 @@
diff --git a/Jambase b/Jambase
--- a/Jambase
+++ b/Jambase
@@ -4247,7 +4247,7 @@
actions GenFileND1
{
- $(>)
+ @emulator@ $(>)
}
actions GenFileNND1
@@ -4410,7 +4410,7 @@
actions GenFile1
{
PATH="$PATH:."
- $(>[1]) $(<) $(>[2-])
+ @emulator@ $(>[1]) $(<) $(>[2-])
}
actions CreateCatFile_