diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2016-07-12 20:13:22 +0200 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2016-07-12 22:00:10 +0200 |
| commit | 40785f0dac55be9bffa029498d20539e567822be (patch) | |
| tree | c126c0271b8644830e16cd0c1a5d906d520fed65 /pkgs/tools/networking/srelay | |
| parent | ba2eec97b5022848fffeb8c85303b7afe4690e82 (diff) | |
| parent | 9aa3e78ab206556754186cc2b88aea5009af0f7c (diff) | |
| download | nixlib-40785f0dac55be9bffa029498d20539e567822be.tar nixlib-40785f0dac55be9bffa029498d20539e567822be.tar.gz nixlib-40785f0dac55be9bffa029498d20539e567822be.tar.bz2 nixlib-40785f0dac55be9bffa029498d20539e567822be.tar.lz nixlib-40785f0dac55be9bffa029498d20539e567822be.tar.xz nixlib-40785f0dac55be9bffa029498d20539e567822be.tar.zst nixlib-40785f0dac55be9bffa029498d20539e567822be.zip | |
Merge branch 'master' into staging
Hydra nixpkgs: ?compare=1282763
Diffstat (limited to 'pkgs/tools/networking/srelay')
| -rw-r--r-- | pkgs/tools/networking/srelay/arm.patch | 12 | ||||
| -rw-r--r-- | pkgs/tools/networking/srelay/default.nix | 21 |
2 files changed, 33 insertions, 0 deletions
diff --git a/pkgs/tools/networking/srelay/arm.patch b/pkgs/tools/networking/srelay/arm.patch new file mode 100644 index 000000000000..f56f2c0f2f0a --- /dev/null +++ b/pkgs/tools/networking/srelay/arm.patch @@ -0,0 +1,12 @@ +diff -ru srelay-0.4.8b4.orig/configure srelay-0.4.8b4/configure +--- srelay-0.4.8b4.orig/configure 2010-12-21 01:11:14.000000000 +1100 ++++ srelay-0.4.8b4/configure 2016-06-22 09:03:42.250000345 +1000 +@@ -1875,7 +1875,7 @@ + ;; + linux*) + case "$host_cpu" in +- i*86|mips*|powerpc*|sparc*|x86_64*) ++ i*86|mips*|powerpc*|sparc*|x86_64*|arm*) + OS=LINUX + cat >>confdefs.h <<\_ACEOF + #define LINUX 1 diff --git a/pkgs/tools/networking/srelay/default.nix b/pkgs/tools/networking/srelay/default.nix new file mode 100644 index 000000000000..853a21da73c4 --- /dev/null +++ b/pkgs/tools/networking/srelay/default.nix @@ -0,0 +1,21 @@ +{ stdenv, fetchurl, openssl }: + +stdenv.mkDerivation rec { + name = "srelay-0.4.8b6"; + + src = fetchurl { + url = "https://sourceforge.net/projects/socks-relay/files/socks-relay/srelay-0.4.8/srelay-0.4.8b6.tar.gz"; + sha256 = "1az9ds10hpmpw6bqk7fcd1w70001kz0mm48v3vgg2z6vrbmgn0qj"; + }; + + patches = [ ./arm.patch ]; + + installPhase = "install -D srelay $out/bin/srelay"; + + meta = { + description = "A SOCKS proxy and relay"; + homepage = http://socks-relay.sourceforge.net/; + platforms = stdenv.lib.platforms.unix; + license = stdenv.lib.licenses.bsd3; + }; +} |