Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
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.
- Loading branch information
1 parent
d61c223
commit 95c8277
Showing
18 changed files
with
84 additions
and
75 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
File renamed without changes.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -4,10 +4,9 @@ | |
, static ? false | ||
}: | ||
|
||
let version = "1.2.11"; in | ||
|
||
stdenv.mkDerivation rec { | ||
name = "zlib-${version}"; | ||
version = "1.2.11"; | ||
|
||
src = fetchurl { | ||
urls = | ||
|
@@ -19,7 +18,7 @@ stdenv.mkDerivation rec { | |
|
||
patches = stdenv.lib.optional hostPlatform.isCygwin ./disable-cygwin-widechar.patch; | ||
|
||
postPatch = stdenv.lib.optionalString stdenv.isDarwin '' | ||
postPatch = stdenv.lib.optionalString hostPlatform.isDarwin '' | ||
substituteInPlace configure \ | ||
--replace '/usr/bin/libtool' 'ar' \ | ||
--replace 'AR="libtool"' 'AR="ar"' \ | ||
|
@@ -30,14 +29,6 @@ stdenv.mkDerivation rec { | |
setOutputFlags = false; | ||
outputDoc = "dev"; # single tiny man3 page | ||
|
||
# TODO(@Dridus) CC set by cc-wrapper setup-hook, so just empty out the preConfigure script when cross building, but leave the old incorrect script when not | ||
# cross building to avoid hash breakage. Once hash breakage is acceptable, remove preConfigure entirely. | ||
preConfigure = stdenv.lib.optionalString (hostPlatform == buildPlatform) '' | ||
if test -n "$crossConfig"; then | ||
export CC=$crossConfig-gcc | ||
fi | ||
''; | ||
|
||
# FIXME needs gcc 4.9 in bootstrap tools | ||
hardeningDisable = [ "stackprotector" ]; | ||
|
||
|
@@ -49,36 +40,41 @@ stdenv.mkDerivation rec { | |
# jww (2015-01-06): Sometimes this library install as a .so, even on | ||
# Darwin; others time it installs as a .dylib. I haven't yet figured out | ||
# what causes this difference. | ||
+ stdenv.lib.optionalString stdenv.isDarwin '' | ||
+ stdenv.lib.optionalString hostPlatform.isDarwin '' | ||
for file in $out/lib/*.so* $out/lib/*.dylib* ; do | ||
install_name_tool -id "$file" $file | ||
done | ||
'' | ||
# Non-typical naming confuses libtool which then refuses to use zlib's DLL | ||
# in some cases, e.g. when compiling libpng. | ||
+ stdenv.lib.optionalString (hostPlatform.libc == "msvcrt") '' | ||
ln -s zlib1.dll $out/bin/libz.dll | ||
''; | ||
|
||
# As zlib takes part in the stdenv building, we don't want references | ||
# to the bootstrap-tools libgcc (as uses to happen on arm/mips) | ||
NIX_CFLAGS_COMPILE = stdenv.lib.optionalString (!stdenv.isDarwin) "-static-libgcc"; | ||
NIX_CFLAGS_COMPILE = stdenv.lib.optionalString (!hostPlatform.isDarwin) "-static-libgcc"; | ||
This comment has been minimized.
Sorry, something went wrong.
This comment has been minimized.
Sorry, something went wrong.
Ericson2314
Author
Member
|
||
|
||
crossAttrs = { | ||
dontStrip = static; | ||
configurePlatforms = []; | ||
} // stdenv.lib.optionalAttrs (hostPlatform.libc == "msvcrt") { | ||
installFlags = [ | ||
"BINARY_PATH=$(out)/bin" | ||
"INCLUDE_PATH=$(dev)/include" | ||
"LIBRARY_PATH=$(out)/lib" | ||
]; | ||
makeFlags = [ | ||
"-f" "win32/Makefile.gcc" | ||
"PREFIX=${stdenv.cc.prefix}" | ||
] ++ stdenv.lib.optional (!static) "SHARED_MODE=1"; | ||
dontStrip = hostPlatform != buildPlatform && static; | ||
configurePlatforms = []; | ||
|
||
# Non-typical naming confuses libtool which then refuses to use zlib's DLL | ||
# in some cases, e.g. when compiling libpng. | ||
postInstall = postInstall + "ln -s zlib1.dll $out/bin/libz.dll"; | ||
}; | ||
installFlags = stdenv.lib.optionals (hostPlatform.libc == "msvcrt") [ | ||
"BINARY_PATH=$(out)/bin" | ||
"INCLUDE_PATH=$(dev)/include" | ||
"LIBRARY_PATH=$(out)/lib" | ||
]; | ||
|
||
passthru.version = version; | ||
makeFlags = [ | ||
"PREFIX=${stdenv.cc.prefix}" | ||
] ++ stdenv.lib.optionals (hostPlatform.libc == "msvcrt") [ | ||
"-f" "win32/Makefile.gcc" | ||
] ++ stdenv.lib.optionals (!static) [ | ||
"SHARED_MODE=1" | ||
]; | ||
|
||
passthru = { | ||
inherit version; | ||
}; | ||
|
||
meta = with stdenv.lib; { | ||
description = "Lossless data-compression library"; | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
4 changes: 3 additions & 1 deletion
4
pkgs/tools/archivers/unzip/cross-cc.patch → ...ls/archivers/unzip/dont-hardcode-cc.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -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 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
@Ericson2314 Should this be "(!hostPlatform.cc.isGNU)"? See #35636.