public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #87435 from matthewbauer/strip-more-in-cross

Browse Source 
treewide: strip more things in cross
This commit is contained in:
Matthew Bauer 2020-05-29 22:28:04 -05:00 committed by GitHub
commit 01377fc6ef
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 4 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/development/libraries/libpcap/default.nix
View File

@ -22,12 +22,14 @@ stdenv.mkDerivation rec {
"ac_cv_linux_vers=2" "ac_cv_linux_vers=2"
]; ];
dontStrip = stdenv.hostPlatform != stdenv.buildPlatform;
prePatch = stdenv.lib.optionalString stdenv.isDarwin '' prePatch = stdenv.lib.optionalString stdenv.isDarwin ''
substituteInPlace configure --replace " -arch i386" "" substituteInPlace configure --replace " -arch i386" ""
''; '';
postInstall = ''
rm -f $out/lib/libpcap.a
'';
meta = with stdenv.lib; { meta = with stdenv.lib; {
homepage = "https://www.tcpdump.org"; homepage = "https://www.tcpdump.org";
description = "Packet Capture Library"; description = "Packet Capture Library";

4
pkgs/development/libraries/readline/6.3.nix
View File

@ -32,10 +32,6 @@ stdenv.mkDerivation {
in in
import ./readline-6.3-patches.nix patch); import ./readline-6.3-patches.nix patch);
# Don't run the native `strip' when cross-compiling.
dontStrip = stdenv.hostPlatform != stdenv.buildPlatform;
bash_cv_func_sigsetjmp = if stdenv.isCygwin then "missing" else null;
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "Library for interactive line editing"; description = "Library for interactive line editing";

4
pkgs/development/libraries/readline/7.0.nix
View File

@ -32,10 +32,6 @@ stdenv.mkDerivation rec {
] ]
++ upstreamPatches; ++ upstreamPatches;
# Don't run the native `strip' when cross-compiling.
dontStrip = stdenv.hostPlatform != stdenv.buildPlatform;
bash_cv_func_sigsetjmp = if stdenv.isCygwin then "missing" else null;
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "Library for interactive line editing"; description = "Library for interactive line editing";

4
pkgs/development/libraries/readline/8.0.nix
View File

@ -32,10 +32,6 @@ stdenv.mkDerivation rec {
] ]
++ upstreamPatches; ++ upstreamPatches;
# Don't run the native `strip' when cross-compiling.
dontStrip = stdenv.hostPlatform != stdenv.buildPlatform;
bash_cv_func_sigsetjmp = if stdenv.isCygwin then "missing" else null;
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "Library for interactive line editing"; description = "Library for interactive line editing";

4
pkgs/development/tools/misc/libtool/libtool2.nix
View File

@ -26,10 +26,6 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true; enableParallelBuilding = true;
# Don't run the native `strip' when cross-compiling. This breaks at least
# with `.a' files for MinGW.
dontStrip = stdenv.hostPlatform != stdenv.buildPlatform;
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "GNU Libtool, a generic library support script"; description = "GNU Libtool, a generic library support script";
longDescription = '' longDescription = ''