mirror of
https://github.com/NixOS/nixpkgs.git
synced 2025-02-22 20:14:37 +00:00
Merge pull request #275755 from uninsane/pr-cross-argyllcms
argyllcms: support cross compilation
This commit is contained in:
commit
dabc3e0a03
@ -1,7 +1,7 @@
|
|||||||
{ stdenv, fetchzip, jam, unzip, libX11, libXxf86vm, libXrandr, libXinerama
|
{ stdenv, fetchzip, jam, unzip, libX11, libXxf86vm, libXrandr, libXinerama
|
||||||
, libXrender, libXext, libtiff, libjpeg, libpng, libXScrnSaver, writeText
|
, libXrender, libXext, libtiff, libjpeg, libpng, libXScrnSaver, writeText
|
||||||
, libXdmcp, libXau, lib, openssl
|
, libXdmcp, libXau, lib, openssl
|
||||||
, writeScript
|
, buildPackages, substituteAll, writeScript
|
||||||
}:
|
}:
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
@ -17,6 +17,14 @@ stdenv.mkDerivation rec {
|
|||||||
|
|
||||||
nativeBuildInputs = [ jam unzip ];
|
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) ''
|
postPatch = lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform) ''
|
||||||
substituteInPlace Jambase \
|
substituteInPlace Jambase \
|
||||||
--replace "-m64" ""
|
--replace "-m64" ""
|
||||||
|
22
pkgs/tools/graphics/argyllcms/jam-cross.patch
Normal file
22
pkgs/tools/graphics/argyllcms/jam-cross.patch
Normal 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_
|
||||||
|
|
Loading…
Reference in New Issue
Block a user