[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
06/08: Revert "PRELIMINARY: gnu: polkit: Work on making it functional in
From: |
Mark H. Weaver |
Subject: |
06/08: Revert "PRELIMINARY: gnu: polkit: Work on making it functional in practice." |
Date: |
Wed, 19 Aug 2015 03:56:29 +0000 |
mhw pushed a commit to branch master
in repository guix.
commit 89a39d4e761fa13673c669770228d3e84fdafeb7
Author: Mark H Weaver <address@hidden>
Date: Tue Aug 18 23:56:17 2015 -0400
Revert "PRELIMINARY: gnu: polkit: Work on making it functional in practice."
This reverts commit e640340b9ec6c601720977820b2701d6cd99b74c.
---
gnu/packages/polkit.scm | 58 ++++++----------------------------------------
1 files changed, 8 insertions(+), 50 deletions(-)
diff --git a/gnu/packages/polkit.scm b/gnu/packages/polkit.scm
index 4a4775d..172b0e1 100644
--- a/gnu/packages/polkit.scm
+++ b/gnu/packages/polkit.scm
@@ -1,6 +1,5 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2014 Andreas Enge <address@hidden>
-;;; Copyright © 2015 Mark H Weaver <address@hidden>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -48,57 +47,16 @@
(patches (list (search-patch "polkit-drop-test.patch")))))
(build-system gnu-build-system)
(inputs
- `(("expat" ,expat)
- ("linux-pam" ,linux-pam)
- ("mozjs" ,mozjs)
- ("nspr" ,nspr)))
+ `(("expat" ,expat)
+ ("glib:bin" ,glib "bin") ; for glib-mkenums
+ ("intltool" ,intltool)
+ ("linux-pam" ,linux-pam)
+ ("mozjs" ,mozjs)
+ ("nspr" ,nspr)))
(propagated-inputs
- `(("glib" ,glib))) ; required by polkit-gobject-1.pc
+ `(("glib" ,glib))) ; required by polkit-gobject-1.pc
(native-inputs
- `(("pkg-config" ,pkg-config)
- ("glib:bin" ,glib "bin") ; for glib-mkenums
- ("intltool" ,intltool)
- ("gobject-introspection" ,gobject-introspection)))
- (arguments
- `(#:configure-flags '("--sysconfdir=/etc"
- "--enable-man-pages")
- #:phases
- (modify-phases %standard-phases
- (add-after
- 'unpack 'patch-file-names
- (lambda* (#:key outputs #:allow-other-keys)
- (substitute* "src/polkitagent/polkitagentsession.c"
- (("PACKAGE_PREFIX \"/lib/polkit-1/polkit-agent-helper-1\"")
- "\"/run/setuid-programs/polkit-agent-helper-1\""))
- (substitute*
"src/polkitbackend/polkitbackendinteractiveauthority.c"
- (("PACKAGE_DATA_DIR \"/polkit-1/actions\"")
- "\"/run/current-system/profile/share/polkit-1/actions\""))
- (substitute* "src/polkitbackend/polkitbackendjsauthority.c"
- (("PACKAGE_DATA_DIR \"/polkit-1/rules.d\"")
- "\"/run/current-system/profile/share/polkit-1/rules.d\""))
- #t))
- (add-after
- 'unpack 'fix-introspection-install-dir
- (lambda* (#:key outputs #:allow-other-keys)
- (let ((out (assoc-ref outputs "out")))
- (substitute* (find-files "." "Makefile.in")
- (("@INTROSPECTION_GIRDIR@")
- (string-append out "/share/gir-1.0/"))
- (("@INTROSPECTION_TYPELIBDIR@")
- (string-append out "/lib/girepository-1.0/"))))))
- (replace
- 'install
- (lambda* (#:key outputs (make-flags '()) #:allow-other-keys)
- ;; Override sysconfdir during "make install", to avoid attempting
- ;; to install in /etc, and to instead install the skeletons in the
- ;; output directory.
- (let ((out (assoc-ref outputs "out")))
- (zero? (apply system*
- "make" "install"
- (string-append "sysconfdir=" out "/etc")
- (string-append "polkit_actiondir="
- out "/share/polkit-1/actions")
- make-flags))))))))
+ `(("pkg-config", pkg-config)))
(home-page "http://www.freedesktop.org/wiki/Software/polkit/")
(synopsis "Authorization API for privilege management")
(description "Polkit is an application-level toolkit for defining and
- branch master updated (0f402e4 -> 2376963), Mark H. Weaver, 2015/08/18
- 02/08: Revert "PRELIMINARY: gnu: wpa-supplicant: Install dbus service files.", Mark H. Weaver, 2015/08/18
- 03/08: Revert "PRELIMINARY: Modify dbus-configuration to find setuid helper.", Mark H. Weaver, 2015/08/18
- 05/08: Revert "PRELIMINARY: Add dbus-fixed.", Mark H. Weaver, 2015/08/18
- 07/08: Revert "PRELIMINARY: dbus-service: Include system-services directories.", Mark H. Weaver, 2015/08/18
- 04/08: Revert "PRELIMINARY: Add three programs to %setuid-programs.", Mark H. Weaver, 2015/08/18
- 06/08: Revert "PRELIMINARY: gnu: polkit: Work on making it functional in practice.",
Mark H. Weaver <=
- 01/08: Revert "PRELIMINARY: gnu: Add network-manager.", Mark H. Weaver, 2015/08/18
- 08/08: Revert "PRELIMINARY: gnu: Add ppp.", Mark H. Weaver, 2015/08/18