diff options
author | Edward Tjörnhammar <ed@cflags.cc> | 2015-01-14 22:07:53 +0100 |
---|---|---|
committer | Edward Tjörnhammar <ed@cflags.cc> | 2015-01-14 22:08:47 +0100 |
commit | a512ddbb3e6dc06275af18c7bbb0ba4249f3eae0 (patch) | |
tree | 8280b7263b0f784ed94d2b735ae1aeff209df01b | |
parent | ee62982af7e8a587692739a4a9cc8c5a65cab037 (diff) |
nylon: fix metas and patch configure to use libevent.so not the absent libevent.a
-rw-r--r-- | pkgs/tools/networking/nylon/configure-use-solib.patch | 33 | ||||
-rw-r--r-- | pkgs/tools/networking/nylon/default.nix | 10 |
2 files changed, 40 insertions, 3 deletions
diff --git a/pkgs/tools/networking/nylon/configure-use-solib.patch b/pkgs/tools/networking/nylon/configure-use-solib.patch new file mode 100644 index 0000000000000..02491d7660ea3 --- /dev/null +++ b/pkgs/tools/networking/nylon/configure-use-solib.patch @@ -0,0 +1,33 @@ +--- nylon-1.21/configure 2006-08-20 00:53:31.000000000 +0200 ++++ nylon-1.21-patch/configure 2015-01-13 22:23:34.509154220 +0100 +@@ -5174,25 +5174,25 @@ + *) + echo "$as_me:$LINENO: result: $withval" >&5 + echo "${ECHO_T}$withval" >&6 +- if test -f $withval/include/event.h -a -f $withval/lib/libevent.a; then ++ if test -f $withval/include/event.h -a -f $withval/lib/libevent.so; then + owd=`pwd` + if cd $withval; then withval=`pwd`; cd $owd; fi + EVENTINC="-I$withval/include" + EVENTLIB="-L$withval/lib -levent" +- elif test -f $withval/event.h -a -f $withval/libevent.a; then ++ elif test -f $withval/event.h -a -f $withval/libevent.so; then + owd=`pwd` + if cd $withval; then withval=`pwd`; cd $owd; fi + EVENTINC="-I$withval" + EVENTLIB="-L$withval -levent" + else +- { { echo "$as_me:$LINENO: error: event.h or libevent.a not found in $withval" >&5 +-echo "$as_me: error: event.h or libevent.a not found in $withval" >&2;} ++ { { echo "$as_me:$LINENO: error: event.h or libevent.so not found in $withval" >&5 ++echo "$as_me: error: event.h or libevent.so not found in $withval" >&2;} + { (exit 1); exit 1; }; } + fi + ;; + esac + else +- if test -f ${prefix}/include/event.h -a -f ${prefix}/lib/libevent.a; ++ if test -f ${prefix}/include/event.h -a -f ${prefix}/lib/libevent.so; + then + EVENTINC="-I${prefix}/include" + EVENTLIB="-L${prefix}/lib -levent" diff --git a/pkgs/tools/networking/nylon/default.nix b/pkgs/tools/networking/nylon/default.nix index 9a9d41ed6a487..daeb7ffb57bb8 100644 --- a/pkgs/tools/networking/nylon/default.nix +++ b/pkgs/tools/networking/nylon/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, libevent} : +{ stdenv, fetchurl, libevent }: stdenv.mkDerivation { name = "nylon-1.21"; @@ -7,13 +7,17 @@ stdenv.mkDerivation { sha256 = "34c132b005c025c1a5079aae9210855c80f50dc51dde719298e1113ad73408a4"; }; + patches = [ ./configure-use-solib.patch ]; + configureFlags = [ "--with-libevent=${libevent}" ]; buildInputs = [ libevent ]; - meta = { + meta = with stdenv.lib; { homepage = http://monkey.org/~marius/nylon; description = "Proxy server, supporting SOCKS 4 and 5, as well as a mirror mode"; - license = stdenv.lib.licenses.free; + license = licenses.bsdOriginal; + maintainers = with maintainers; [ edwtjo viric ]; + platform = platforms.linux; }; } |