diff options
| author | John Ericson <John.Ericson@Obsidian.Systems> | 2017-06-23 17:45:27 -0400 |
|---|---|---|
| committer | John Ericson <John.Ericson@Obsidian.Systems> | 2017-06-30 10:09:31 -0400 |
| commit | 95c8277701fb746ad4d91841de494ee869886991 (patch) | |
| tree | 120ec8dad2d1a6d1c678f3d51778328f5ad2a110 /pkgs/tools/archivers/unzip | |
| parent | d61c22341b00171b53697164cb8241184979d14c (diff) | |
| download | nixpkgs-95c8277701fb746ad4d91841de494ee869886991.tar nixpkgs-95c8277701fb746ad4d91841de494ee869886991.tar.gz nixpkgs-95c8277701fb746ad4d91841de494ee869886991.tar.bz2 nixpkgs-95c8277701fb746ad4d91841de494ee869886991.tar.lz nixpkgs-95c8277701fb746ad4d91841de494ee869886991.tar.xz nixpkgs-95c8277701fb746ad4d91841de494ee869886991.tar.zst nixpkgs-95c8277701fb746ad4d91841de494ee869886991.zip | |
misc pkgs: Remove unneeded *Platform == *Platform comparisons
PR #26007 used these to avoid causing a mass rebuild. Now that we know things work, we do that to clean up.
Diffstat (limited to 'pkgs/tools/archivers/unzip')
| -rw-r--r-- | pkgs/tools/archivers/unzip/default.nix | 5 | ||||
| -rw-r--r-- | pkgs/tools/archivers/unzip/dont-hardcode-cc.patch (renamed from pkgs/tools/archivers/unzip/cross-cc.patch) | 4 |
2 files changed, 5 insertions, 4 deletions
diff --git a/pkgs/tools/archivers/unzip/default.nix b/pkgs/tools/archivers/unzip/default.nix index ad484b3d4d9..896cdd50973 100644 --- a/pkgs/tools/archivers/unzip/default.nix +++ b/pkgs/tools/archivers/unzip/default.nix @@ -1,7 +1,6 @@ { stdenv, fetchurl , bzip2 , enableNLS ? false, libnatspec -, buildPlatform, hostPlatform }: stdenv.mkDerivation { @@ -23,13 +22,13 @@ stdenv.mkDerivation { ./CVE-2015-7697.diff ./CVE-2014-9913.patch ./CVE-2016-9844.patch + ./dont-hardcode-cc.patch ] ++ stdenv.lib.optional enableNLS (fetchurl { url = "http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/app-arch/unzip/files/unzip-6.0-natspec.patch?revision=1.1"; name = "unzip-6.0-natspec.patch"; sha256 = "67ab260ae6adf8e7c5eda2d1d7846929b43562943ec4aff629bd7018954058b1"; - }) - ++ stdenv.lib.optional (hostPlatform != buildPlatform) ./cross-cc.patch; + }); nativeBuildInputs = [ bzip2 ]; buildInputs = [ bzip2 ] ++ stdenv.lib.optional enableNLS libnatspec; diff --git a/pkgs/tools/archivers/unzip/cross-cc.patch b/pkgs/tools/archivers/unzip/dont-hardcode-cc.patch index 3d38ffdef6e..15dbbfe4c53 100644 --- a/pkgs/tools/archivers/unzip/cross-cc.patch +++ b/pkgs/tools/archivers/unzip/dont-hardcode-cc.patch @@ -1,12 +1,14 @@ --- a/unix/Makefile +++ b/unix/Makefile -@@ -42,9 +42,7 @@ +@@ -42,9 +42,9 @@ # such as -DDOSWILD). # UnZip flags -CC = cc# try using "gcc" target rather than changing this (CC and LD ++CC ?= cc# try using "gcc" target rather than changing this (CC and LD LD = $(CC)# must match, else "unresolved symbol: ___main" is possible) -AS = as ++AS ?= as LOC = $(D_USE_BZ2) $(LOCAL_UNZIP) AF = $(LOC) CFLAGS = -O |