diff options
| author | Joachim F <joachifm@users.noreply.github.com> | 2018-02-17 11:06:02 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-02-17 11:06:02 +0000 |
| commit | 828b635bd96a5c60419a6f9b2e1476c718ee285d (patch) | |
| tree | 8698dd56a8e2c1a6457336019952e14e7424d424 | |
| parent | 1c7fa5b421e9b0fdb4ef3ba7abe1c9a7ae31e0d9 (diff) | |
| parent | 2e45234acfb5db2c339dcc252b7b206a953ca12f (diff) | |
| download | nixlib-828b635bd96a5c60419a6f9b2e1476c718ee285d.tar nixlib-828b635bd96a5c60419a6f9b2e1476c718ee285d.tar.gz nixlib-828b635bd96a5c60419a6f9b2e1476c718ee285d.tar.bz2 nixlib-828b635bd96a5c60419a6f9b2e1476c718ee285d.tar.lz nixlib-828b635bd96a5c60419a6f9b2e1476c718ee285d.tar.xz nixlib-828b635bd96a5c60419a6f9b2e1476c718ee285d.tar.zst nixlib-828b635bd96a5c60419a6f9b2e1476c718ee285d.zip | |
Merge pull request #34997 from rick68/softether
softether: 4.20 -> 4.25
| -rw-r--r-- | pkgs/servers/softether/4.25.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.25.nix b/pkgs/servers/softether/4.25.nix new file mode 100644 index 000000000000..b1e9c5c1a455 --- /dev/null +++ b/pkgs/servers/softether/4.25.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.25"; + build = "9656"; + compiledDate = "2018.01.15"; + 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 = "1y1m8lf0xfh7m70d15wj2jjf5a5qhi3j49ciwqmsscsqvb1xwimr"; + }; + + 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 4d28631530ec..bfb536473836 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12321,7 +12321,8 @@ with pkgs; softether_4_18 = callPackage ../servers/softether/4.18.nix { }; softether_4_20 = callPackage ../servers/softether/4.20.nix { }; - softether = softether_4_20; + softether_4_25 = callPackage ../servers/softether/4.25.nix { }; + softether = softether_4_25; qboot = callPackage ../applications/virtualization/qboot { stdenv = stdenv_32bit; }; |