diff options
author | Orivej Desh <orivej@gmx.fr> | 2017-10-05 08:26:23 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-10-05 08:26:23 +0000 |
commit | 184f80aeb8c70f21f82b89eafc789e8a91504a8d (patch) | |
tree | 5f2547e1200f39a4d7c1bc141c8284bce083f2f5 /pkgs | |
parent | 7c3f185a7f8bdfa9f1ba86d909aebd304ece6164 (diff) | |
parent | 7e4e2667ae95b19ae5982c33c498a100349daccd (diff) | |
download | nixlib-184f80aeb8c70f21f82b89eafc789e8a91504a8d.tar nixlib-184f80aeb8c70f21f82b89eafc789e8a91504a8d.tar.gz nixlib-184f80aeb8c70f21f82b89eafc789e8a91504a8d.tar.bz2 nixlib-184f80aeb8c70f21f82b89eafc789e8a91504a8d.tar.lz nixlib-184f80aeb8c70f21f82b89eafc789e8a91504a8d.tar.xz nixlib-184f80aeb8c70f21f82b89eafc789e8a91504a8d.tar.zst nixlib-184f80aeb8c70f21f82b89eafc789e8a91504a8d.zip |
Merge pull request #29781 from rick68/softether
softether: 4.18 -> 4.20
Diffstat (limited to 'pkgs')
-rw-r--r-- | pkgs/servers/softether/4.20.nix | 53 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 3 |
2 files changed, 55 insertions, 1 deletions
diff --git a/pkgs/servers/softether/4.20.nix b/pkgs/servers/softether/4.20.nix new file mode 100644 index 000000000000..c6ef5a3a4df2 --- /dev/null +++ b/pkgs/servers/softether/4.20.nix @@ -0,0 +1,53 @@ +{ stdenv, fetchurl +, openssl, readline, ncurses, zlib }: + +let + os = if stdenv.isLinux then "1" + else if stdenv.isFreeBSD then "2" + else if stdenv.isSunOS then "3" + else if stdenv.isDarwin then "4" + else if stdenv.isOpenBSD then "5" + else ""; + cpuBits = if stdenv.is64bit then "2" else "1"; + +in + +stdenv.mkDerivation rec { + name = "softether-${version}"; + version = "4.20"; + build = "9608"; + compiledDate = "2016.04.17"; + dataDir = "/var/lib/softether"; + + src = fetchurl { + url = "http://www.softether-download.com/files/softether/v${version}-${build}-rtm-${compiledDate}-tree/Source_Code/softether-src-v${version}-${build}-rtm.tar.gz"; + sha256 = "e559644e34ec6feba43d99f4083f77f9b082dd0574d0bb1e416a65f32ccbc51e"; + }; + + buildInputs = [ openssl readline ncurses zlib ]; + + preConfigure = '' + echo "${os} + ${cpuBits} + " | ./configure + rm configure + ''; + + buildPhase = '' + mkdir -p $out/bin + sed -i \ + -e "/INSTALL_BINDIR=/s|/usr/bin|/bin|g" \ + -e "/_DIR=/s|/usr|${dataDir}|g" \ + -e "s|\$(INSTALL|$out/\$(INSTALL|g" \ + -e "/echo/s|echo $out/|echo |g" \ + Makefile + ''; + + meta = with stdenv.lib; { + description = "An Open-Source Free Cross-platform Multi-protocol VPN Program"; + homepage = https://www.softether.org/; + license = licenses.gpl2; + maintainers = [ maintainers.rick68 ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f971713b166a..f7e19ee1b34c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11738,7 +11738,8 @@ with pkgs; oracleXE = callPackage ../servers/sql/oracle-xe { }; softether_4_18 = callPackage ../servers/softether/4.18.nix { }; - softether = softether_4_18; + softether_4_20 = callPackage ../servers/softether/4.20.nix { }; + softether = softether_4_20; qboot = callPackage ../applications/virtualization/qboot { stdenv = stdenv_32bit; }; |