diff options
author | John Ericson <John.Ericson@Obsidian.Systems> | 2017-06-28 23:17:21 -0400 |
---|---|---|
committer | John Ericson <John.Ericson@Obsidian.Systems> | 2017-06-28 23:17:21 -0400 |
commit | 16be434b0bec4d14a893010b46f56a64cab74cc1 (patch) | |
tree | 25e77807d55c76d42817197d576349478ff500a5 /pkgs/applications | |
parent | d76bc8ed15cfa21d9f1cc47a06ee1fe8ac86d6d3 (diff) | |
parent | b0ada07f36abc21c990000b5cdbe780157d6b92b (diff) | |
download | nixlib-16be434b0bec4d14a893010b46f56a64cab74cc1.tar nixlib-16be434b0bec4d14a893010b46f56a64cab74cc1.tar.gz nixlib-16be434b0bec4d14a893010b46f56a64cab74cc1.tar.bz2 nixlib-16be434b0bec4d14a893010b46f56a64cab74cc1.tar.lz nixlib-16be434b0bec4d14a893010b46f56a64cab74cc1.tar.xz nixlib-16be434b0bec4d14a893010b46f56a64cab74cc1.tar.zst nixlib-16be434b0bec4d14a893010b46f56a64cab74cc1.zip |
Merge accepted cross compilation PRs into staging
Diffstat (limited to 'pkgs/applications')
-rw-r--r-- | pkgs/applications/editors/vim/default.nix | 3 | ||||
-rw-r--r-- | pkgs/applications/graphics/ImageMagick/7.0.nix | 7 | ||||
-rw-r--r-- | pkgs/applications/graphics/ImageMagick/default.nix | 9 | ||||
-rw-r--r-- | pkgs/applications/graphics/fbida/default.nix | 4 | ||||
-rw-r--r-- | pkgs/applications/networking/offrss/default.nix | 1 | ||||
-rw-r--r-- | pkgs/applications/version-management/fossil/default.nix | 2 | ||||
-rw-r--r-- | pkgs/applications/video/omxplayer/default.nix | 9 |
7 files changed, 16 insertions, 19 deletions
diff --git a/pkgs/applications/editors/vim/default.nix b/pkgs/applications/editors/vim/default.nix index b8fee7bd1e24..4eefb207fd75 100644 --- a/pkgs/applications/editors/vim/default.nix +++ b/pkgs/applications/editors/vim/default.nix @@ -36,9 +36,6 @@ stdenv.mkDerivation rec { "ac_cv_sizeof_int=4" "vim_cv_memmove_handles_overlap=yes" "vim_cv_memmove_handles_overlap=yes" - - # TODO(@Ericson2314): wont' be needed soon. - "STRIP=${hostPlatform.config}-strip" ]; postInstall = '' diff --git a/pkgs/applications/graphics/ImageMagick/7.0.nix b/pkgs/applications/graphics/ImageMagick/7.0.nix index bcad077b38c9..5eaf488fff53 100644 --- a/pkgs/applications/graphics/ImageMagick/7.0.nix +++ b/pkgs/applications/graphics/ImageMagick/7.0.nix @@ -2,6 +2,7 @@ , bzip2, zlib, libX11, libXext, libXt, fontconfig, freetype, ghostscript, libjpeg , lcms2, openexr, libpng, librsvg, libtiff, libxml2, openjpeg, libwebp , ApplicationServices +, buildPlatform, hostPlatform }: let @@ -47,7 +48,7 @@ stdenv.mkDerivation rec { [ "--with-gs-font-dir=${ghostscript}/share/ghostscript/fonts" "--with-gslib" ] - ++ lib.optionals (stdenv.cross.libc or null == "msvcrt") + ++ lib.optionals hostPlatform.isMinGW [ "--enable-static" "--disable-shared" ] # due to libxml2 being without DLLs ATM ; @@ -57,13 +58,13 @@ stdenv.mkDerivation rec { [ zlib fontconfig freetype ghostscript libpng libtiff libxml2 ] - ++ lib.optionals (stdenv.cross.libc or null != "msvcrt") + ++ lib.optionals (!hostPlatform.isMinGW) [ openexr librsvg openjpeg ] ++ lib.optional stdenv.isDarwin ApplicationServices; propagatedBuildInputs = [ bzip2 freetype libjpeg lcms2 ] - ++ lib.optionals (stdenv.cross.libc or null != "msvcrt") + ++ lib.optionals (!hostPlatform.isMinGW) [ libX11 libXext libXt libwebp ] ; diff --git a/pkgs/applications/graphics/ImageMagick/default.nix b/pkgs/applications/graphics/ImageMagick/default.nix index 8f4d44932f59..39812b2cfc47 100644 --- a/pkgs/applications/graphics/ImageMagick/default.nix +++ b/pkgs/applications/graphics/ImageMagick/default.nix @@ -2,6 +2,7 @@ , bzip2, zlib, libX11, libXext, libXt, fontconfig, freetype, ghostscript, libjpeg , lcms2, openexr, libpng, librsvg, libtiff, libxml2, openjpeg, libwebp , ApplicationServices +, buildPlatform, hostPlatform }: let @@ -18,7 +19,7 @@ let } # Freeze version on mingw so we don't need to port the patch too often. # FIXME: This version has multiple security vulnerabilities - // lib.optionalAttrs (stdenv.cross.libc or null == "msvcrt") { + // lib.optionalAttrs (hostPlatform.isMinGW) { version = "6.9.2-0"; sha256 = "17ir8bw1j7g7srqmsz3rx780sgnc21zfn0kwyj78iazrywldx8h7"; patches = [(fetchpatch { @@ -59,7 +60,7 @@ stdenv.mkDerivation rec { [ "--with-gs-font-dir=${ghostscript}/share/ghostscript/fonts" "--with-gslib" ] - ++ lib.optionals (stdenv.cross.libc or null == "msvcrt") + ++ lib.optionals (hostPlatform.isMinGW) [ "--enable-static" "--disable-shared" ] # due to libxml2 being without DLLs ATM ; @@ -69,13 +70,13 @@ stdenv.mkDerivation rec { [ zlib fontconfig freetype ghostscript libpng libtiff libxml2 ] - ++ lib.optionals (stdenv.cross.libc or null != "msvcrt") + ++ lib.optionals (!hostPlatform.isMinGW) [ openexr librsvg openjpeg ] ++ lib.optional stdenv.isDarwin ApplicationServices; propagatedBuildInputs = [ bzip2 freetype libjpeg lcms2 ] - ++ lib.optionals (stdenv.cross.libc or null != "msvcrt") + ++ lib.optionals (!hostPlatform.isMinGW) [ libX11 libXext libXt libwebp ] ; diff --git a/pkgs/applications/graphics/fbida/default.nix b/pkgs/applications/graphics/fbida/default.nix index 5f0605bbf87c..d06c3eb5ec13 100644 --- a/pkgs/applications/graphics/fbida/default.nix +++ b/pkgs/applications/graphics/fbida/default.nix @@ -21,10 +21,6 @@ stdenv.mkDerivation rec { sed -e 's@ cpp\>@ gcc -E -@' -i GNUmakefile ''; - crossAttrs = { - makeFlags = makeFlags ++ [ "CC=${stdenv.cross.config}-gcc" "STRIP=" ]; - }; - meta = with stdenv.lib; { description = "Image viewing and manipulation programs"; homepage = https://www.kraxel.org/blog/linux/fbida/; diff --git a/pkgs/applications/networking/offrss/default.nix b/pkgs/applications/networking/offrss/default.nix index fd1406127ad8..1cae91dbf861 100644 --- a/pkgs/applications/networking/offrss/default.nix +++ b/pkgs/applications/networking/offrss/default.nix @@ -13,7 +13,6 @@ stdenv.mkDerivation { preConfigure = '' sed 's/^PDF/#PDF/' -i Makefile ''; - makeFlags = "CC=${stdenv.cross.config}-gcc"; }; buildInputs = [ curl libmrss podofo ] diff --git a/pkgs/applications/version-management/fossil/default.nix b/pkgs/applications/version-management/fossil/default.nix index 14a492f6cc2b..69c763acd836 100644 --- a/pkgs/applications/version-management/fossil/default.nix +++ b/pkgs/applications/version-management/fossil/default.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { crossAttrs = { doCheck = false; - makeFlagsArray = [ "TCC=${stdenv.cross.config}-gcc" ]; + makeFlags = [ "TCC=$CC" ]; }; meta = { diff --git a/pkgs/applications/video/omxplayer/default.nix b/pkgs/applications/video/omxplayer/default.nix index 01a85f3d9528..29345f7548d5 100644 --- a/pkgs/applications/video/omxplayer/default.nix +++ b/pkgs/applications/video/omxplayer/default.nix @@ -1,4 +1,7 @@ -{ stdenv, fetchurl, raspberrypifw, pcre, boost, freetype, zlib }: +{ stdenv, fetchurl +, raspberrypifw, pcre, boost, freetype, zlib +, hostPlatform +}: let ffmpeg = stdenv.mkDerivation rec { @@ -46,10 +49,10 @@ let crossAttrs = { configurePlatforms = []; configureFlags = configureFlags ++ [ - "--cross-prefix=${stdenv.cross.config}-" + "--cross-prefix=${stdenv.cc.prefix}" "--enable-cross-compile" "--target_os=linux" - "--arch=${stdenv.cross.arch}" + "--arch=${hostPlatform.arch}" ]; }; |