summary refs log tree commit diff
path: root/pkgs/tools/networking
diff options
context:
space:
mode:
authorTuomas Tynkkynen <tuomas.tynkkynen@iki.fi>2015-10-11 01:32:07 +0300
committerVladimír Čunát <vcunat@gmail.com>2015-10-28 10:17:08 +0100
commit0eadc53b4b082f6212a1e95679461196bdeb2534 (patch)
treeb9ef7ee74009d3193f4a7d98825a146f403ca7cc /pkgs/tools/networking
parent06eba7d3202c361457d53d270d2d5538beab78f8 (diff)
downloadnixlib-0eadc53b4b082f6212a1e95679461196bdeb2534.tar
nixlib-0eadc53b4b082f6212a1e95679461196bdeb2534.tar.gz
nixlib-0eadc53b4b082f6212a1e95679461196bdeb2534.tar.bz2
nixlib-0eadc53b4b082f6212a1e95679461196bdeb2534.tar.lz
nixlib-0eadc53b4b082f6212a1e95679461196bdeb2534.tar.xz
nixlib-0eadc53b4b082f6212a1e95679461196bdeb2534.tar.zst
nixlib-0eadc53b4b082f6212a1e95679461196bdeb2534.zip
wget: Remove runtime dependency on OpenSSL headers
It collects compilation and linking flags that are displayed on
`wget --version`. Setting to 0 (NULL) is safe.
Diffstat (limited to 'pkgs/tools/networking')
-rw-r--r--pkgs/tools/networking/wget/default.nix2
-rw-r--r--pkgs/tools/networking/wget/remove-runtime-dep-on-openssl-headers.patch17
2 files changed, 19 insertions, 0 deletions
diff --git a/pkgs/tools/networking/wget/default.nix b/pkgs/tools/networking/wget/default.nix
index f7fcfdf0f26e..db30562babed 100644
--- a/pkgs/tools/networking/wget/default.nix
+++ b/pkgs/tools/networking/wget/default.nix
@@ -10,6 +10,8 @@ stdenv.mkDerivation rec {
     sha256 = "0dzv5xf9qxc2bp4cyifmaghh3h464wbm73xiwcrvckf1ynqbgxv7";
   };
 
+  patches = [ ./remove-runtime-dep-on-openssl-headers.patch ];
+
   preConfigure = ''
     for i in "doc/texi2pod.pl" "util/rmold.pl"; do
       sed -i "$i" -e 's|/usr/bin.*perl|${perl}/bin/perl|g'
diff --git a/pkgs/tools/networking/wget/remove-runtime-dep-on-openssl-headers.patch b/pkgs/tools/networking/wget/remove-runtime-dep-on-openssl-headers.patch
new file mode 100644
index 000000000000..a6a1fcfcb37b
--- /dev/null
+++ b/pkgs/tools/networking/wget/remove-runtime-dep-on-openssl-headers.patch
@@ -0,0 +1,17 @@
+diff --git a/src/Makefile.in b/src/Makefile.in
+index 1a36a9b..e279c84 100644
+--- a/src/Makefile.in
++++ b/src/Makefile.in
+@@ -2211,10 +2211,9 @@ version.c:  $(wget_SOURCES) ../lib/libgnu.a
+ 	echo '' >> $@
+ 	echo '#include "version.h"' >> $@
+ 	echo 'const char *version_string = "@VERSION@";' >> $@
+-	echo 'const char *compilation_string = "'$(COMPILE)'";' \
++	echo 'const char *compilation_string = 0;' \
+ 	    | $(ESCAPEQUOTE) >> $@
+-	echo 'const char *link_string = "'$(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+-	$(AM_LDFLAGS) $(LDFLAGS) $(LIBS) $(wget_LDADD)'";' \
++	echo 'const char *link_string = 0;' \
+ 	    | $(ESCAPEQUOTE) >> $@
+ 
+ css.c: $(srcdir)/css.l