commit a512ddbb3e6dc06275af18c7bbb0ba4249f3eae0 · pyrox.dev/nixpkgs

+33

pkgs/tools/networking/nylon/configure-use-solib.patch

···

       1
       1
       +
       --- nylon-1.21/configure	2006-08-20 00:53:31.000000000 +0200

     

       2
       2
       +
       +++ nylon-1.21-patch/configure	2015-01-13 22:23:34.509154220 +0100

     

       3
       3
       +
       @@ -5174,25 +5174,25 @@

     

       4
       4
       +
          *)

     

       5
       5
       +
             echo "$as_me:$LINENO: result: $withval" >&5

     

       6
       6
       +
        echo "${ECHO_T}$withval" >&6

     

       7
       7
       +
       -     if test -f $withval/include/event.h -a -f $withval/lib/libevent.a; then

     

       8
       8
       +
       +     if test -f $withval/include/event.h -a -f $withval/lib/libevent.so; then

     

       9
       9
       +
                owd=`pwd`

     

       10
       10
       +
                if cd $withval; then withval=`pwd`; cd $owd; fi

     

       11
       11
       +
                EVENTINC="-I$withval/include"

     

       12
       12
       +
                EVENTLIB="-L$withval/lib -levent"

     

       13
       13
       +
       -     elif test -f $withval/event.h -a -f $withval/libevent.a; then

     

       14
       14
       +
       +     elif test -f $withval/event.h -a -f $withval/libevent.so; then

     

       15
       15
       +
                owd=`pwd`

     

       16
       16
       +
                if cd $withval; then withval=`pwd`; cd $owd; fi

     

       17
       17
       +
                EVENTINC="-I$withval"

     

       18
       18
       +
                EVENTLIB="-L$withval -levent"

     

       19
       19
       +
             else

     

       20
       20
       +
       -        { { echo "$as_me:$LINENO: error: event.h or libevent.a not found in $withval" >&5

     

       21
       21
       +
       -echo "$as_me: error: event.h or libevent.a not found in $withval" >&2;}

     

       22
       22
       +
       +        { { echo "$as_me:$LINENO: error: event.h or libevent.so not found in $withval" >&5

     

       23
       23
       +
       +echo "$as_me: error: event.h or libevent.so not found in $withval" >&2;}

     

       24
       24
       +
           { (exit 1); exit 1; }; }

     

       25
       25
       +
             fi

     

       26
       26
       +
             ;;

     

       27
       27
       +
          esac

     

       28
       28
       +
        else

     

       29
       29
       +
       -   if test -f ${prefix}/include/event.h -a -f ${prefix}/lib/libevent.a;

     

       30
       30
       +
       +   if test -f ${prefix}/include/event.h -a -f ${prefix}/lib/libevent.so;

     

       31
       31
       +
        then

     

       32
       32
       +
             EVENTINC="-I${prefix}/include"

     

       33
       33
       +
             EVENTLIB="-L${prefix}/lib -levent"

+7 -3

pkgs/tools/networking/nylon/default.nix

···

       1
       1
       -
       {stdenv, fetchurl, libevent} :

     

       1
       1
       +
       { stdenv, fetchurl, libevent }:

     

       2
       2
        
       

     

       3
       3
        
       stdenv.mkDerivation {

     

       4
       4
        
         name = "nylon-1.21";

     
···

       7
       7
        
           sha256 = "34c132b005c025c1a5079aae9210855c80f50dc51dde719298e1113ad73408a4";

     

       8
       8
        
         };

     

       9
       9
        
       

     

       10
       10
       +
         patches = [ ./configure-use-solib.patch ];

     

       11
       11
       +
       

     

       10
       12
        
         configureFlags = [ "--with-libevent=${libevent}" ];

     

       11
       13
        
       

     

       12
       14
        
         buildInputs = [ libevent ];

     

       13
       15
        
       

     

       14
       14
       -
         meta = {

     

       16
       16
       +
         meta = with stdenv.lib; {

     

       15
       17
        
           homepage = http://monkey.org/~marius/nylon;

     

       16
       18
        
           description = "Proxy server, supporting SOCKS 4 and 5, as well as a mirror mode";

     

       17
       17
       -
           license = stdenv.lib.licenses.free;

     

       19
       19
       +
           license = licenses.bsdOriginal;

     

       20
       20
       +
           maintainers = with maintainers; [ edwtjo viric ];

     

       21
       21
       +
           platform = platforms.linux;

     

       18
       22
        
         };

     

       19
       23
        
       }