diff options
| author | Robert Schütz <dev@schuetz-co.de> | 2021-05-27 23:13:52 +0200 |
|---|---|---|
| committer | Jonathan Ringer <jonringer@users.noreply.github.com> | 2021-05-29 14:00:57 -0700 |
| commit | 966188ff80f5c4b808f0144c3effd64c5db5b593 (patch) | |
| tree | 49efe383a1edb20397e5008220717f4d23fb6e65 /pkgs/tools/networking/openvpn | |
| parent | f188138af3ebfd2f4d3c87f591b23b98396424f9 (diff) | |
| download | nixpkgs-966188ff80f5c4b808f0144c3effd64c5db5b593.tar nixpkgs-966188ff80f5c4b808f0144c3effd64c5db5b593.tar.gz nixpkgs-966188ff80f5c4b808f0144c3effd64c5db5b593.tar.bz2 nixpkgs-966188ff80f5c4b808f0144c3effd64c5db5b593.tar.lz nixpkgs-966188ff80f5c4b808f0144c3effd64c5db5b593.tar.xz nixpkgs-966188ff80f5c4b808f0144c3effd64c5db5b593.tar.zst nixpkgs-966188ff80f5c4b808f0144c3effd64c5db5b593.zip | |
openvpn-auth-ldap: 2.0.3+deb6.1 -> 2.0.4
Diffstat (limited to 'pkgs/tools/networking/openvpn')
| -rw-r--r-- | pkgs/tools/networking/openvpn/openvpn-auth-ldap.nix | 61 |
1 files changed, 23 insertions, 38 deletions
diff --git a/pkgs/tools/networking/openvpn/openvpn-auth-ldap.nix b/pkgs/tools/networking/openvpn/openvpn-auth-ldap.nix index bb06479be30..70dacddafc3 100644 --- a/pkgs/tools/networking/openvpn/openvpn-auth-ldap.nix +++ b/pkgs/tools/networking/openvpn/openvpn-auth-ldap.nix @@ -1,65 +1,50 @@ -{ stdenv, lib, fetchFromGitHub, fetchpatch, - autoreconfHook, re2c, openldap, openvpn, gnustep, check +{ lib +, stdenv +, fetchFromGitHub +, autoreconfHook +, gnustep +, re2c +, openldap +, openssl +, openvpn }: -let - srcName = "openvpn-auth-ldap"; - srcVersion = "2.0.3"; - debianRev = "6.1"; - - fetchPatchFromDebian = - {patch, sha256}: - fetchpatch { - inherit sha256; - url = "http://sources.debian.net/data/main/o/${srcName}/${srcVersion}-${debianRev}/debian/patches/${patch}"; - }; -in - stdenv.mkDerivation rec { - name = "${srcName}-${version}"; - version = "${srcVersion}+deb${debianRev}"; + pname = "openvpn-auth-ldap"; + version = "2.0.4"; src = fetchFromGitHub { owner = "threerings"; - repo = srcName; - rev = "auth-ldap-${srcVersion}"; - sha256 = "1v635ylzf5x3l3lirf3n6173q1w8g0ssjjkf27qqw98c3iqp63sq"; + repo = "openvpn-auth-ldap"; + rev = "auth-ldap-${version}"; + sha256 = "1j30sygj8nm8wjqxzpb7pfzr3dxqxggswzxd7z5yk7y04c0yp1hb"; }; - patches = map fetchPatchFromDebian [ - {patch = "STARTTLS_before_auth.patch"; - sha256 = "02kky73mgx9jf16lpabppl271zyjn4a1160k8b6a0fax5ic8gbwk";} - {patch = "gobjc_4.7_runtime.patch"; - sha256 = "0ljmdn70g5xp4kjcv59wg2wnqaifjdfdv1wlj356d10a7fzvxc76";} - {patch = "openvpn_ldap_simpler_add_handler_4"; - sha256 = "0nha9mazp3dywbs1ywj8xi4ahzsjsasyrcic87v8c0x2nwl9kaa0";} - {patch = "auth-ldap-gnustep.patch"; - sha256 = "053jni1s3pacpi2s43dkmk95j79ifh8rybjly13yy2dqffbasr31";} - ]; - nativeBuildInputs = [ autoreconfHook - ]; - - buildInputs = [ - check gnustep.base gnustep.libobjc gnustep.make + re2c + ]; + + buildInputs = [ openldap + openssl openvpn - re2c ]; configureFlags = [ - "--with-objc-runtime=modern" + "--with-objc-runtime=GNU" "--with-openvpn=${openvpn}/include" "--libdir=$(out)/lib/openvpn" ]; + doCheck = true; + preInstall = '' mkdir -p $out/lib/openvpn $out/share/doc/openvpn/examples - cp README $out/share/doc/openvpn/ + cp README.md $out/share/doc/openvpn/ cp auth-ldap.conf $out/share/doc/openvpn/examples/ ''; |