git.iko.soy/typeable/nixpkgs
on master help sign in
appgate-sdp: 5.1.2 -> 5.3.2
commitee73665fa096ab3b5d88c1cd1c8ba8bd3366082a authorYurii Matsiuk <ymatsiuk@users.noreply.github.com> dateMon 11 Jan 2021, 11:51 (6 years ago) parentb97a905
1 file changed+26−13
pkgs/applications/networking/appgate-sdp/default.nix+26−13
pkgs/applications/networking/appgate-sdp/default.nix+26−13
@@ -20,6 +20,8 @@
2020, iproute
2121, krb5
2222, lib
23+, mesa
24+, libdrm
2325, libX11
2426, libXScrnSaver
2527, libXcomposite
@@ -65,6 +67,8 @@ let
6567 gtk3
6668 icu
6769 krb5
70+ mesa
71+ libdrm
6872 libX11
6973 libXScrnSaver
7074 libXcomposite
@@ -92,11 +96,11 @@ let
9296in
9397stdenv.mkDerivation rec {
9498 pname = "appgate-sdp";
95− version = "5.1.2";
99+ version = "5.3.2";
96100
97101 src = fetchurl {
98− url = "https://bin.appgate-sdp.com/5.1/client/appgate-sdp_${version}_amd64.deb";
99− sha256 = "0v4vfibg1giml3vfz2w7qypqzymvfchi5qm6vfagah2vfbkw7xc2";
102+ url = "https://bin.appgate-sdp.com/${lib.versions.majorMinor version}/client/appgate-sdp_${version}_amd64.deb";
103+ sha256 = "123d4mx2nsh8q3ckm4g2chdcdwgg0cz9cvhiwjggxzvy7j6bqgy4";
100104 };
101105
102106 dontConfigure = true;
@@ -123,26 +127,35 @@ stdenv.mkDerivation rec {
123127 cp -r $out/usr/share $out/share
124128
125129 for file in $out/opt/appgate/linux/appgate-resolver.pre \
126− $out/opt/appgate/linux/appgate-dumb-resolver.pre \
127− $out/lib/systemd/system/appgatedriver.service \
128− $out/lib/systemd/system/appgate-dumb-resolver.service \
129− $out/lib/systemd/system/appgate-resolver.service
130+ $out/opt/appgate/linux/appgate-dumb-resolver.pre
130131 do
131132 substituteInPlace $file \
132133 --replace "/bin/sh" "${bash}/bin/sh" \
133− --replace "/opt/" "$out/opt/" \
134− --replace "/usr/sbin/dnsmasq" "${dnsmasq}/bin/dnsmasq" \
135− --replace "InaccessiblePaths=/mnt /srv /boot /media" "InaccessiblePaths=-/mnt -/srv -/boot -/media" \
136134 --replace "cat" "${coreutils}/bin/cat" \
137135 --replace "chattr" "${e2fsprogs}/bin/chattr" \
138136 --replace "mv" "${coreutils}/bin/mv" \
139137 --replace "pkill" "${procps}/bin/pkill"
140138 done
141139
140+ for file in $out/lib/systemd/system/appgatedriver.service \
141+ $out/lib/systemd/system/appgate-dumb-resolver.service \
142+ $out/lib/systemd/system/appgate-resolver.service
143+ do
144+ substituteInPlace $file \
145+ --replace "/bin/sh" "${bash}/bin/sh" \
146+ --replace "/opt/" "$out/opt/" \
147+ --replace "chattr" "${e2fsprogs}/bin/chattr" \
148+ --replace "mv" "${coreutils}/bin/mv"
149+ done
150+
151+ substituteInPlace $out/lib/systemd/system/appgatedriver.service \
152+ --replace "InaccessiblePaths=/mnt /srv /boot /media" "InaccessiblePaths=-/mnt -/srv -/boot -/media"
153+
154+ substituteInPlace $out/lib/systemd/system/appgate-resolver.service \
155+ --replace "/usr/sbin/dnsmasq" "${dnsmasq}/bin/dnsmasq"
156+
142157 substituteInPlace $out/opt/appgate/linux/nm.py --replace "/usr/sbin/dnsmasq" "${dnsmasq}/bin/dnsmasq"
143− substituteInPlace $out/opt/appgate/linux/set_dns \
144− --replace "service appgate-resolver stop" "${systemd.out}/bin/systemctl stop appgate-resolver" \
145− --replace "/etc/appgate.conf" "$out/etc/appgate.conf"
158+ substituteInPlace $out/opt/appgate/linux/set_dns --replace "/etc/appgate.conf" "$out/etc/appgate.conf"
146159
147160 '';
148161