summaryrefslogtreecommitdiffstats
path: root/guix
diff options
context:
space:
mode:
Diffstat (limited to 'guix')
-rw-r--r--guix/jd/desktops/base.scm1
-rwxr-xr-xguix/jd/packages/patches/nm-pptp-autogen.patch15
-rw-r--r--guix/jd/packages/vpn.scm158
3 files changed, 0 insertions, 174 deletions
diff --git a/guix/jd/desktops/base.scm b/guix/jd/desktops/base.scm
index 01a9a89..fb85c56 100644
--- a/guix/jd/desktops/base.scm
+++ b/guix/jd/desktops/base.scm
@@ -1,5 +1,4 @@
1(define-module (jd desktops base) 1(define-module (jd desktops base)
2 #:use-module (jd packages vpn)
3 #:use-module (jd home services polkit) 2 #:use-module (jd home services polkit)
4 #:use-module (jd home services desktop) 3 #:use-module (jd home services desktop)
5 #:use-module (jd services polkit) 4 #:use-module (jd services polkit)
diff --git a/guix/jd/packages/patches/nm-pptp-autogen.patch b/guix/jd/packages/patches/nm-pptp-autogen.patch
deleted file mode 100755
index ef5c731..0000000
--- a/guix/jd/packages/patches/nm-pptp-autogen.patch
+++ /dev/null
@@ -1,15 +0,0 @@
1diff --git a/autogen.sh b/autogen.sh
2index 4ed20c6..34834a6 100755
3--- a/autogen.sh
4+++ b/autogen.sh
5@@ -13,8 +13,6 @@ PKG_NAME=NetworkManager-pptp
6 exit 1
7 }
8
9-(cd $srcdir;
10- autoreconf --install --symlink &&
11- ./configure --enable-maintainer-mode --enable-more-warnings=error $@
12-)
13+cd $srcdir
14+autoreconf --install --symlink
15
diff --git a/guix/jd/packages/vpn.scm b/guix/jd/packages/vpn.scm
deleted file mode 100644
index ccfb8f7..0000000
--- a/guix/jd/packages/vpn.scm
+++ /dev/null
@@ -1,158 +0,0 @@
1(define-module (jd packages vpn)
2 #:use-module (jd utils)
3
4 #:use-module (gnu packages)
5 #:use-module (gnu packages samba) ;; PPP
6 #:use-module (gnu packages perl)
7 #:use-module (gnu packages linux)
8 #:use-module (gnu packages gnome)
9 #:use-module (gnu packages glib)
10 #:use-module (gnu packages pkg-config)
11 #:use-module (gnu packages build-tools)
12 #:use-module (gnu packages gettext)
13 #:use-module (gnu packages autotools)
14 #:use-module (gnu packages gtk)
15
16 #:use-module (guix gexp)
17 #:use-module (guix git-download)
18 #:use-module ((guix licenses) #:prefix license:)
19 #:use-module (guix build-system)
20 #:use-module (guix build-system gnu)
21 #:use-module (guix utils)
22 #:use-module (guix packages)
23 #:use-module (guix download)
24 #:use-module (guix inferior)
25 #:use-module (guix channels))
26
27
28(define channels
29 (list (channel
30 (name 'guix)
31 (url "https://git.savannah.gnu.org/git/guix.git")
32 (commit
33 "9b77bd0b9b4f3de69390da0ba7db5b9dbc01e554"))))
34
35(define inferior
36 (inferior-for-channels channels))
37
38(define ppp-2.4.9 (car (lookup-inferior-packages inferior "ppp")))
39
40
41(define-public pptp-client
42 (package
43 (name "pptp-client")
44 (version "1.10.0")
45 (source
46 (origin
47 (method git-fetch)
48 (uri (git-reference
49 (url "https://git.code.sf.net/p/pptpclient/git")
50 (commit version)))
51 (sha256
52 (base32 "0qixs1dxrr1x4sgi22250231p9kqi8l8ifawxn6ws1d3p7mc6ggh"))))
53
54 (build-system gnu-build-system)
55 (arguments
56 '(#:phases
57 (modify-phases %standard-phases
58 (delete 'configure)
59 (delete 'check)
60 (add-before 'build 'change-location-of-pppd
61 (lambda* (#:key outputs #:allow-other-keys)
62 (substitute* "Makefile"
63 (("^PPPD.=.*$")
64 (string-append "PPPD = "
65 (which "pppd")))
66 (("^IP.=.*$")
67 (string-append "IP = "
68 (which "ip"))))))
69 (replace 'install
70 (lambda* (#:key outputs #:allow-other-keys)
71 (let* ((out (assoc-ref outputs "out"))
72 (sbin (string-append out "/sbin")))
73 (mkdir-p sbin)
74 (install-file "pptp" sbin)
75 #t))))))
76 (inputs
77 (list perl))
78 (native-inputs
79 (list ppp-2.4.9
80 iproute))
81 (home-page "https://sourceforge.net/projects/pptpclient/")
82 (synopsis "PPTP-Client")
83 (description
84 "pptp is an implementation of the PPTP protocol for Linux and
85other Unix systems.")
86 (license license:gpl2+)
87 (properties `((upstream-name . "NetworkManager-pptp")))))
88
89
90;; ================================
91
92(define-public network-manager-pptp
93 (package
94 (name "network-manager-pptp")
95 (version "1.2.12")
96 (source
97 (origin
98 (method git-fetch)
99 (uri (git-reference
100 (url "https://gitlab.gnome.org/GNOME/NetworkManager-pptp.git")
101 (commit version)))
102 (file-name (git-file-name name version))
103
104 (sha256
105 (base32 "1prl14106kfl5x56v9adwi4wqwrh6k3chkimjpd0clwy3drywhcr"))
106 (patches (jd-search-patches "nm-pptp-autogen.patch"))))
107
108 (build-system gnu-build-system)
109 (arguments
110 '(#:configure-flags '("--enable-absolute-paths"
111 ; "--localstatedir=/var"
112 "--with-gtk4=yes")
113 #:phases
114 (modify-phases %standard-phases
115 (add-after 'configure 'patch-path
116 (lambda* (#:key inputs #:allow-other-keys #:rest args)
117 (let* ((pppd (search-input-file inputs "/sbin/pppd"))
118 (pptp (search-input-file inputs "/sbin/pptp"))
119 (modprobe (search-input-file inputs "/bin/modprobe"))
120 (pretty-pppd (string-append "\"" pppd "\""))
121 (pretty-pptp (string-append "\"" pptp "\"")))
122
123 (substitute* "src/nm-pptp-service.c"
124 (("\"/usr/local/sbin/pppd\"") pretty-pppd)
125 (("\"/usr/sbin/pppd\"") pretty-pppd)
126 (("\"/sbin/pppd\"") pretty-pppd)
127 (("\"/usr/local/sbin/pptp\"") pretty-pptp)
128 (("\"/usr/sbin/pptp\"") pretty-pptp)
129 (("\"/sbin/pptp\"") pretty-pptp)
130 (("/sbin/modprobe") modprobe))))))))
131 (native-inputs
132 (list intltool
133 `(,glib "bin")
134 glib
135 `(,gtk "bin")
136 pkg-config))
137 (inputs
138 (list autoconf
139 autoconf-archive
140 gnulib
141 gnu-gettext
142 automake
143 gtk+
144 gtk
145 kmod
146 libtool
147 network-manager
148 libnma
149 libsecret
150 ppp-2.4.9
151 pptp-client))
152 (home-page "https://wiki.gnome.org/Projects/NetworkManager/VPN")
153 (synopsis "PPTP plug-in for NetworkManager")
154 (description
155 "This extension of NetworkManager allows it to take care of connections
156to virtual private networks (VPNs) via pptp.")
157 (license license:gpl2+)
158 (properties `((upstream-name . "NetworkManager-pptp")))))
generated by cgit v1.2.3 (git 2.45.2) at 2024-11-21 21:41:21 +0000