diff options
author | John Ericson <Ericson2314@yahoo.com> | 2017-06-28 21:39:16 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-06-28 21:39:16 -0400 |
commit | e1faeb574ae6f0946cdd8a3b32a5907e1d8e29da (patch) | |
tree | 9ee09b5bb752ff52f38d0d4dc19572d4b7fc0c68 /pkgs/tools | |
parent | 425e9ce493218acc5dd001cf7656e45f73b82596 (diff) | |
parent | 9f156f4a8a945dee1beeb49f6c2acb395c0af9c8 (diff) | |
download | nixlib-e1faeb574ae6f0946cdd8a3b32a5907e1d8e29da.tar nixlib-e1faeb574ae6f0946cdd8a3b32a5907e1d8e29da.tar.gz nixlib-e1faeb574ae6f0946cdd8a3b32a5907e1d8e29da.tar.bz2 nixlib-e1faeb574ae6f0946cdd8a3b32a5907e1d8e29da.tar.lz nixlib-e1faeb574ae6f0946cdd8a3b32a5907e1d8e29da.tar.xz nixlib-e1faeb574ae6f0946cdd8a3b32a5907e1d8e29da.tar.zst nixlib-e1faeb574ae6f0946cdd8a3b32a5907e1d8e29da.zip |
Merge pull request #26884 from obsidiansystems/purge-stdenv-cross
Purge stdenv cross
Diffstat (limited to 'pkgs/tools')
-rw-r--r-- | pkgs/tools/filesystems/mtdutils/default.nix | 4 | ||||
-rw-r--r-- | pkgs/tools/graphics/optipng/default.nix | 28 | ||||
-rw-r--r-- | pkgs/tools/networking/tcpdump/default.nix | 6 | ||||
-rw-r--r-- | pkgs/tools/package-management/nix/default.nix | 5 | ||||
-rw-r--r-- | pkgs/tools/system/tm/default.nix | 4 | ||||
-rw-r--r-- | pkgs/tools/system/ts/default.nix | 9 | ||||
-rw-r--r-- | pkgs/tools/text/html-tidy/default.nix | 6 | ||||
-rw-r--r-- | pkgs/tools/text/replace/default.nix | 6 |
8 files changed, 28 insertions, 40 deletions
diff --git a/pkgs/tools/filesystems/mtdutils/default.nix b/pkgs/tools/filesystems/mtdutils/default.nix index ed3850b9fdd6..d0ceaf94a75f 100644 --- a/pkgs/tools/filesystems/mtdutils/default.nix +++ b/pkgs/tools/filesystems/mtdutils/default.nix @@ -15,10 +15,6 @@ stdenv.mkDerivation rec { buildInputs = [ libuuid lzo zlib acl ]; - crossAttrs = { - makeFlags = "CC=${stdenv.cross.config}-gcc"; - }; - meta = { description = "Tools for MTD filesystems"; license = stdenv.lib.licenses.gpl2Plus; diff --git a/pkgs/tools/graphics/optipng/default.nix b/pkgs/tools/graphics/optipng/default.nix index 0f7f7e2da2a2..471e8ee8df47 100644 --- a/pkgs/tools/graphics/optipng/default.nix +++ b/pkgs/tools/graphics/optipng/default.nix @@ -1,4 +1,6 @@ -{ stdenv, fetchurl, libpng, static ? false }: +{ stdenv, fetchurl, libpng, static ? false +, buildPlatform, hostPlatform +}: # This package comes with its own copy of zlib, libpng and pngxtern @@ -15,20 +17,16 @@ stdenv.mkDerivation rec { buildInputs = [ libpng ]; LDFLAGS = optional static "-static"; - configureFlags = "--with-system-zlib --with-system-libpng"; - - crossAttrs = { - CC="${stdenv.cross.config}-gcc"; - LD="${stdenv.cross.config}-gcc"; - AR="${stdenv.cross.config}-ar"; - RANLIB="${stdenv.cross.config}-ranlib"; - configurePhase = '' - ./configure -prefix="$out" --with-system-zlib --with-system-libpng - ''; - postInstall = optional (stdenv.cross.libc == "msvcrt") '' - mv "$out"/bin/optipng "$out"/bin/optipng.exe - ''; - }; + configureFlags = [ + "--with-system-zlib" + "--with-system-libpng" + ] ++ stdenv.lib.optionals (hostPlatform != buildPlatform) [ + #"-prefix=$out" + ]; + + postInstall = if hostPlatform != buildPlatform && hostPlatform.isWindows then '' + mv "$out"/bin/optipng{,.exe} + '' else null; meta = with stdenv.lib; { homepage = http://optipng.sourceforge.net/; diff --git a/pkgs/tools/networking/tcpdump/default.nix b/pkgs/tools/networking/tcpdump/default.nix index 42cb3867e05c..a7130a3891b9 100644 --- a/pkgs/tools/networking/tcpdump/default.nix +++ b/pkgs/tools/networking/tcpdump/default.nix @@ -1,4 +1,6 @@ -{ stdenv, fetchurl, libpcap, enableStatic ? false }: +{ stdenv, fetchurl, libpcap, enableStatic ? false +, hostPlatform +}: stdenv.mkDerivation rec { name = "tcpdump-${version}"; @@ -15,7 +17,7 @@ stdenv.mkDerivation rec { crossAttrs = { LDFLAGS = if enableStatic then "-static" else ""; configureFlags = [ "ac_cv_linux_vers=2" ] ++ (stdenv.lib.optional - (stdenv.cross.platform.kernelMajor == "2.4") "--disable-ipv6"); + (hostPlatform.platform.kernelMajor == "2.4") "--disable-ipv6"); }; meta = { diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix index 3aa18fad9423..45dfd52dba19 100644 --- a/pkgs/tools/package-management/nix/default.nix +++ b/pkgs/tools/package-management/nix/default.nix @@ -2,6 +2,7 @@ , pkgconfig, boehmgc, perlPackages, libsodium, aws-sdk-cpp, brotli, readline , autoreconfHook, autoconf-archive, bison, flex, libxml2, libxslt, docbook5, docbook5_xsl , libseccomp, busybox +, hostPlatform , storeDir ? "/nix/store" , stateDir ? "/nix/var" , confDir ? "/etc" @@ -95,8 +96,8 @@ let --disable-init-state --enable-gc '' + stdenv.lib.optionalString ( - stdenv.cross ? nix && stdenv.cross.nix ? system - ) ''--with-system=${stdenv.cross.nix.system}''; + hostPlatform ? nix && hostPlatform.nix ? system + ) ''--with-system=${hostPlatform.nix.system}''; doInstallCheck = false; }; diff --git a/pkgs/tools/system/tm/default.nix b/pkgs/tools/system/tm/default.nix index 3326f535b5f6..3442dbb62b05 100644 --- a/pkgs/tools/system/tm/default.nix +++ b/pkgs/tools/system/tm/default.nix @@ -10,10 +10,6 @@ stdenv.mkDerivation { sed -i 's@/usr/bin/install@install@g ; s/gcc/cc/g' Makefile ''; - crossAttrs = { - makeFlags = "CC=${stdenv.cross.config}-gcc"; - }; - src = fetchurl { url = http://vicerveza.homeunix.net/~viric/soft/tm/tm-0.4.1.tar.gz; sha256 = "3b389bc03b6964ad5ffa57a344b891fdbcf7c9b2604adda723a863f83657c4a0"; diff --git a/pkgs/tools/system/ts/default.nix b/pkgs/tools/system/ts/default.nix index 97b35378673e..cce18b5d54b4 100644 --- a/pkgs/tools/system/ts/default.nix +++ b/pkgs/tools/system/ts/default.nix @@ -1,5 +1,6 @@ -{stdenv, fetchurl, -sendmailPath ? "/run/wrappers/bin/sendmail" }: +{ stdenv, fetchurl +, sendmailPath ? "/run/wrappers/bin/sendmail" +}: stdenv.mkDerivation rec { @@ -7,10 +8,6 @@ stdenv.mkDerivation rec { installPhase=''make install "PREFIX=$out"''; - crossAttrs = { - makeFlags = "CC=${stdenv.cross.config}-gcc"; - }; - patchPhase = '' sed -i s,/usr/sbin/sendmail,${sendmailPath}, mail.c ts.1 ''; diff --git a/pkgs/tools/text/html-tidy/default.nix b/pkgs/tools/text/html-tidy/default.nix index 1a264885b485..cc3283cf8541 100644 --- a/pkgs/tools/text/html-tidy/default.nix +++ b/pkgs/tools/text/html-tidy/default.nix @@ -1,4 +1,6 @@ -{ stdenv, fetchFromGitHub, cmake, libxslt }: +{ stdenv, fetchFromGitHub, cmake, libxslt +, hostPlatform +}: stdenv.mkDerivation rec { name = "html-tidy-${version}"; @@ -14,7 +16,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake libxslt/*manpage*/ ]; cmakeFlags = stdenv.lib.optional - (stdenv.cross.libc or null == "msvcrt") "-DCMAKE_SYSTEM_NAME=Windows"; + (hostPlatform.libc or null == "msvcrt") "-DCMAKE_SYSTEM_NAME=Windows"; # ATM bin/tidy is statically linked, as upstream provides no other option yet. # https://github.com/htacg/tidy-html5/issues/326#issuecomment-160322107 diff --git a/pkgs/tools/text/replace/default.nix b/pkgs/tools/text/replace/default.nix index 40728c2c3ec5..18ef074c8a52 100644 --- a/pkgs/tools/text/replace/default.nix +++ b/pkgs/tools/text/replace/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl}: +{ stdenv, fetchurl }: stdenv.mkDerivation { name = "replace-2.24"; @@ -10,10 +10,6 @@ stdenv.mkDerivation { makeFlags = "TREE=\$(out) MANTREE=\$(TREE)/share/man"; - crossAttrs = { - makeFlags = "TREE=\$(out) MANTREE=\$(TREE)/share/man CC=${stdenv.cross.config}-gcc"; - }; - preBuild = '' sed -e "s@/bin/mv@$(type -P mv)@" -i replace.h ''; |