pyrox.dev
wraith: 1.4.6 -> 1.4.7
+58
pkgs/applications/networking/irc/wraith/configure.patch
+58
pkgs/applications/networking/irc/wraith/configure.patch
···
1
+
--- a/configure
2
+
+++ b/configure
3
+
@@ -6029,53 +6029,8 @@
4
+
#AC_CHECK_HEADERS(zlib.h)
5
+
#EGG_CHECK_ZLIB
6
+
7
+
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for path to OpenSSL" >&5
8
+
-$as_echo_n "checking for path to OpenSSL... " >&6; }
9
+
-
10
+
-
11
+
-# Check whether --with-openssl was given.
12
+
-if test "${with_openssl+set}" = set; then :
13
+
- withval=$with_openssl; with_openssl_path=$withval
14
+
-else
15
+
- with_openssl_path=auto
16
+
-fi
17
+
-
18
+
-
19
+
-
20
+
-cf_openssl_basedir=""
21
+
-if test "$with_openssl_path" != "auto"; then
22
+
- cf_openssl_basedir="`echo ${with_openssl_path} | sed 's/\/$//'`"
23
+
-else
24
+
- for dirs in /usr/local/ssl /usr/pkg /usr/local /usr/local/openssl; do
25
+
- if test -f "${dirs}/include/openssl/opensslv.h" && test -f "${dirs}/lib/libssl.so"; then
26
+
- cf_openssl_basedir="${dirs}"
27
+
- break
28
+
- fi
29
+
- done
30
+
- unset dirs
31
+
-fi
32
+
-if test ! -z "$cf_openssl_basedir"; then
33
+
- if test -f "${cf_openssl_basedir}/include/openssl/opensslv.h" && test -f "${cf_openssl_basedir}/lib/libssl.so"; then
34
+
- SSL_INCLUDES="-I${cf_openssl_basedir}/include"
35
+
- SSL_LIBS="-L${cf_openssl_basedir}/lib"
36
+
- else
37
+
- cf_openssl_basedir=""
38
+
- fi
39
+
-else
40
+
- if test -f "/usr/include/openssl/opensslv.h" ; then
41
+
- cf_openssl_basedir="/usr"
42
+
- fi
43
+
-fi
44
+
-
45
+
-if test ! -z "$cf_openssl_basedir"; then
46
+
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cf_openssl_basedir" >&5
47
+
-$as_echo "$cf_openssl_basedir" >&6; }
48
+
-else
49
+
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5
50
+
-$as_echo "not found" >&6; }
51
+
- as_fn_error 1 "OpenSSL is required." "$LINENO" 5
52
+
-fi
53
+
-unset cf_openssl_basedir
54
+
+SSL_INCLUDES="-I@openssl.dev@/include"
55
+
+SSL_LIBS="-L@openssl.out@/lib"
56
+
57
+
save_CXX="$CXX"
58
+
CXX="$CXX $SSL_INCLUDES"
+7
-6
pkgs/applications/networking/irc/wraith/default.nix
+7
-6
pkgs/applications/networking/irc/wraith/default.nix
···
5
5
6
6
mkDerivation rec {
7
7
name = "wraith-${version}";
8
-
version = "1.4.6";
8
+
version = "1.4.7";
9
9
src = fetchurl {
10
10
url = "mirror://sourceforge/wraithbotpack/wraith-v${version}.tar.gz";
11
-
sha256 = "0vb2hbjmwh040f5yhxvwcfxvgxa0q9zdy9vvddydn8zn782d7wl8";
11
+
sha256 = "0h6liac5y7im0jfm2sj18mibvib7d1l727fjs82irsjj1v9kif3j";
12
12
};
13
13
buildInputs = [ openssl ];
14
-
patches = [ ./dlopen.patch ];
14
+
patches = [ ./configure.patch ./dlopen.patch ];
15
15
postPatch = ''
16
-
substituteInPlace src/libssl.cc --subst-var-by openssl ${openssl}
17
-
substituteInPlace src/libcrypto.cc --subst-var-by openssl ${openssl}
16
+
substituteInPlace configure --subst-var-by openssl.dev ${openssl.dev} \
17
+
--subst-var-by openssl.out ${openssl.out}
18
+
substituteInPlace src/libssl.cc --subst-var-by openssl ${openssl.out}
19
+
substituteInPlace src/libcrypto.cc --subst-var-by openssl ${openssl.out}
18
20
'';
19
-
configureFlags = "--with-openssl=${openssl.dev}";
20
21
installPhase = ''
21
22
mkdir -p $out/bin
22
23
cp -a wraith $out/bin/wraith