diff options
| author | Jörg Thalheim <Mic92@users.noreply.github.com> | 2018-12-01 00:43:02 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-12-01 00:43:02 +0000 |
| commit | 84162175a3ff1b9649b65b5201c063a51cd40368 (patch) | |
| tree | 42ebad1a88d0b1bfe8fab54f815841a1e12ea342 /pkgs/development | |
| parent | 3a3513e7e7d4c252d6240a62d377ef723509d8c0 (diff) | |
| parent | 694b4d29e1d0e4c86d497da437a3eed90910a7db (diff) | |
| download | nixpkgs-84162175a3ff1b9649b65b5201c063a51cd40368.tar nixpkgs-84162175a3ff1b9649b65b5201c063a51cd40368.tar.gz nixpkgs-84162175a3ff1b9649b65b5201c063a51cd40368.tar.bz2 nixpkgs-84162175a3ff1b9649b65b5201c063a51cd40368.tar.lz nixpkgs-84162175a3ff1b9649b65b5201c063a51cd40368.tar.xz nixpkgs-84162175a3ff1b9649b65b5201c063a51cd40368.tar.zst nixpkgs-84162175a3ff1b9649b65b5201c063a51cd40368.zip | |
Merge pull request #51180 from mayflower/xorg-cross
treewide: cross-fixes
Diffstat (limited to 'pkgs/development')
| -rw-r--r-- | pkgs/development/libraries/fribidi/default.nix | 8 | ||||
| -rw-r--r-- | pkgs/development/libraries/ilmbase/cross.patch | 35 | ||||
| -rw-r--r-- | pkgs/development/libraries/ilmbase/default.nix | 7 |
3 files changed, 47 insertions, 3 deletions
diff --git a/pkgs/development/libraries/fribidi/default.nix b/pkgs/development/libraries/fribidi/default.nix index 08b0a87e3e2..b60f4be245e 100644 --- a/pkgs/development/libraries/fribidi/default.nix +++ b/pkgs/development/libraries/fribidi/default.nix @@ -1,5 +1,6 @@ { stdenv , fetchurl +, fetchpatch , meson , ninja @@ -21,6 +22,13 @@ stdenv.mkDerivation rec { sha256 = "1kp4b1hpx2ky20ixgy2xhj5iygfl7ps5k9kglh1z5i7mhykg4r3a"; }; + patches = [ + (fetchpatch { + url = "https://github.com/fribidi/fribidi/pull/88.patch"; + sha256 = "1n4l6333vhbxfckwg101flmvq6bbygg66fjp69ddcjqaqb6gh9k9"; + }) + ]; + postPatch = '' patchShebangs test ''; diff --git a/pkgs/development/libraries/ilmbase/cross.patch b/pkgs/development/libraries/ilmbase/cross.patch new file mode 100644 index 00000000000..207a440a0d8 --- /dev/null +++ b/pkgs/development/libraries/ilmbase/cross.patch @@ -0,0 +1,35 @@ +From: Helmut Grohne <> +Subject: compile build tools with the build architecture compiler + +Patch-Source: https://github.com/openexr/openexr/issues/221 + +Index: ilmbase-2.2.0/configure.ac +=================================================================== +--- ilmbase-2.2.0.orig/configure.ac ++++ ilmbase-2.2.0/configure.ac +@@ -28,6 +28,7 @@ + AC_PROG_LN_S + AC_PROG_LIBTOOL + AC_PROG_MAKE_SET ++AX_PROG_CXX_FOR_BUILD + + dnl + dnl PKGCONFIG preparations +Index: ilmbase-2.2.0/Half/Makefile.am +=================================================================== +--- ilmbase-2.2.0.orig/Half/Makefile.am ++++ ilmbase-2.2.0/Half/Makefile.am +@@ -17,9 +17,11 @@ + + CLEANFILES = eLut eLut.h toFloat toFloat.h + +-eLut_SOURCES = eLut.cpp ++eLut$(EXEEXT): eLut.cpp ++ $(CXX_FOR_BUILD) $(CXXFLAGS_FOR_BUILD) $< -o $@ + +-toFloat_SOURCES = toFloat.cpp ++toFloat$(EXEEXT): toFloat.cpp ++ $(CXX_FOR_BUILD) $(CXXFLAGS_FOR_BUILD) $< -o $@ + + eLut.h: eLut + ./eLut > eLut.h diff --git a/pkgs/development/libraries/ilmbase/default.nix b/pkgs/development/libraries/ilmbase/default.nix index 3989e941b6b..98370f52e18 100644 --- a/pkgs/development/libraries/ilmbase/default.nix +++ b/pkgs/development/libraries/ilmbase/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, automake, autoconf, libtool, which }: +{ stdenv, fetchurl, buildPackages, automake, autoconf, libtool, which }: stdenv.mkDerivation rec { name = "ilmbase-${version}"; @@ -16,11 +16,12 @@ stdenv.mkDerivation rec { ./bootstrap ''; - buildInputs = [ automake autoconf libtool which ]; + depsBuildBuild = [ buildPackages.stdenv.cc ]; + nativeBuildInputs = [ automake autoconf libtool which ]; NIX_CFLAGS_LINK = [ "-pthread" ]; - patches = [ ./bootstrap.patch ]; + patches = [ ./bootstrap.patch ./cross.patch ]; # fails 1 out of 1 tests with # "lt-ImathTest: testBoxAlgo.cpp:892: void {anonymous}::boxMatrixTransform(): Assertion `b21 == b2' failed" |