Unverified Commit dabc3e0a authored by Rick van Schijndel's avatar Rick van Schijndel Committed by GitHub
Browse files

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

argyllcms: support cross compilation
parents 5a14a099 8114d5da
Loading
Loading
Loading
Loading
+9 −1
Original line number Diff line number Diff line
{ 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" ""
+22 −0
Original line number Diff line number Diff line
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_