gnu: dnssec-trigger: Use G-expressions & remove input labels.
* gnu/packages/dns.scm (dnssec-trigger)[arguments]: Rewrite as G-expressions. [inputs, native-inputs]: Remove input labels.master
Tobias Geerinckx-Rice
parent
5dca6c8dfc
commit
523dce3917
|
|
@ -216,84 +216,67 @@ C it should be a lot faster than Perl.")
|
||||||
(build-system glib-or-gtk-build-system)
|
(build-system glib-or-gtk-build-system)
|
||||||
(outputs '("out" "gui" "nm"))
|
(outputs '("out" "gui" "nm"))
|
||||||
(arguments
|
(arguments
|
||||||
`(#:test-target "test"
|
(list #:test-target "test"
|
||||||
#:configure-flags
|
#:configure-flags
|
||||||
(list
|
#~(list
|
||||||
(string-append "--with-ssl="
|
(string-append "--with-ssl=" #$(this-package-input "openssl"))
|
||||||
(assoc-ref %build-inputs "openssl"))
|
"--with-hooks=networkmanager"
|
||||||
"--with-hooks=networkmanager"
|
(string-append "--with-networkmanager-dispatch="
|
||||||
(string-append "--with-networkmanager-dispatch="
|
#$output:nm
|
||||||
(assoc-ref %outputs "nm")
|
"/etc/NetworkManager/dispatcher.d")
|
||||||
"/etc/NetworkManager/dispatcher.d")
|
(string-append "--with-xdg-autostart="
|
||||||
(string-append "--with-xdg-autostart="
|
#$output:gui
|
||||||
(assoc-ref %outputs "gui")
|
"/etc/xdg/autostart")
|
||||||
"/etc/xdg/autostart")
|
(string-append "--with-uidir="
|
||||||
(string-append "--with-uidir="
|
#$output:gui
|
||||||
(assoc-ref %outputs "gui")
|
"/share/dnssec-trigger")
|
||||||
"/share/dnssec-trigger")
|
(string-append "--with-python="
|
||||||
(string-append "--with-python="
|
#$(this-package-native-input "python-wrapper")
|
||||||
(assoc-ref %build-inputs "python")
|
"/bin/python")
|
||||||
"/bin/python")
|
(string-append "--with-unbound-control="
|
||||||
(string-append "--with-unbound-control="
|
#$(this-package-input "unbound")
|
||||||
(assoc-ref %build-inputs "unbound")
|
"/sbin/unbound-control")
|
||||||
"/sbin/unbound-control")
|
"--with-forward-zones-support")
|
||||||
"--with-forward-zones-support")
|
#:phases
|
||||||
#:phases
|
#~(modify-phases %standard-phases
|
||||||
(modify-phases %standard-phases
|
(add-after 'unpack 'patch-configure
|
||||||
(add-after 'unpack 'patch-configure
|
(lambda _
|
||||||
(lambda _
|
(substitute* "configure"
|
||||||
(substitute* "configure"
|
(("appindicator-0.1")
|
||||||
(("appindicator-0.1")
|
"appindicator3-0.1"))))
|
||||||
"appindicator3-0.1"))
|
(add-before 'configure 'patch-makefile
|
||||||
#t))
|
(lambda _
|
||||||
(add-before 'configure 'patch-makefile
|
(substitute* "Makefile.in"
|
||||||
(lambda _
|
(("/usr")
|
||||||
(substitute* "Makefile.in"
|
"$(prefix)")
|
||||||
(("/usr")
|
(("/etc")
|
||||||
"$(prefix)")
|
"$(prefix)/etc")
|
||||||
(("/etc")
|
((".*gtk-update-icon-cache.*")
|
||||||
"$(prefix)/etc")
|
""))))
|
||||||
((".*gtk-update-icon-cache.*")
|
(add-after 'install 'remove-systemd
|
||||||
""))
|
(lambda _
|
||||||
#t))
|
(delete-file-recursively
|
||||||
(add-after 'install 'remove-systemd
|
(string-append #$output "/lib/systemd"))))
|
||||||
(lambda* (#:key outputs #:allow-other-keys)
|
(add-after 'remove-systemd 'move-gui
|
||||||
(let* ((out (assoc-ref outputs "out")))
|
(lambda _
|
||||||
(delete-file-recursively
|
(mkdir-p (string-append #$output:gui "/bin"))
|
||||||
(string-append out "/lib/systemd"))
|
(mkdir-p (string-append #$output:gui "/share"))
|
||||||
#t)))
|
(rename-file
|
||||||
(add-after 'remove-systemd 'move-gui
|
(string-append #$output "/bin")
|
||||||
(lambda* (#:key outputs #:allow-other-keys)
|
(string-append #$output:gui "/bin"))
|
||||||
(let* ((out (assoc-ref outputs "out"))
|
(rename-file
|
||||||
(gui (assoc-ref outputs "gui")))
|
(string-append #$output "/share/icons")
|
||||||
(mkdir-p (string-append gui "/bin"))
|
(string-append #$output:gui "/share/icons"))))
|
||||||
(mkdir-p (string-append gui "/share"))
|
(add-after 'move-gui 'move-nm
|
||||||
(rename-file
|
(lambda _
|
||||||
(string-append out "/bin")
|
(mkdir-p (string-append #$output:nm "/libexec"))
|
||||||
(string-append gui "/bin"))
|
(rename-file
|
||||||
(rename-file
|
(string-append #$output "/libexec")
|
||||||
(string-append out "/share/icons")
|
(string-append #$output:nm "/libexec")))))))
|
||||||
(string-append gui "/share/icons"))
|
|
||||||
#t)))
|
|
||||||
(add-after 'move-gui 'move-nm
|
|
||||||
(lambda* (#:key outputs #:allow-other-keys)
|
|
||||||
(let* ((out (assoc-ref outputs "out"))
|
|
||||||
(nm (assoc-ref outputs "nm")))
|
|
||||||
(mkdir-p (string-append nm "/libexec"))
|
|
||||||
(rename-file
|
|
||||||
(string-append out "/libexec")
|
|
||||||
(string-append nm "/libexec"))
|
|
||||||
#t))))))
|
|
||||||
(native-inputs
|
(native-inputs
|
||||||
`(("cmocka" ,cmocka)
|
(list cmocka pkg-config python-wrapper))
|
||||||
("pkg-config" ,pkg-config)
|
|
||||||
("python" ,python-wrapper)))
|
|
||||||
(inputs
|
(inputs
|
||||||
`(("gtk+-2" ,gtk+-2)
|
(list gtk+-2 ldns libappindicator openssl unbound))
|
||||||
("ldns" ,ldns)
|
|
||||||
("libappindicator" ,libappindicator)
|
|
||||||
("openssl" ,openssl)
|
|
||||||
("unbound" ,unbound)))
|
|
||||||
(synopsis "DNSSEC protection for the DNS traffic")
|
(synopsis "DNSSEC protection for the DNS traffic")
|
||||||
(description "DNSSEC-Trigger enables your computer to use DNSSEC protection
|
(description "DNSSEC-Trigger enables your computer to use DNSSEC protection
|
||||||
for the DNS traffic. It relies on the Unbound DNS resolver running locally on
|
for the DNS traffic. It relies on the Unbound DNS resolver running locally on
|
||||||
|
|
|
||||||
Reference in New Issue