From 95e87d95f6f99aa9bc19fd2d3b290fd896987ced Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Wed, 11 Jun 2025 15:50:12 +0200 Subject: gnu: elogind: Ungraft. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/freedesktop.scm (elogind)[replacement]: Remove. [arguments]: Adjust ‘fix-pkttyagent-path’ phase. (elogind/fixed): Remove. Change-Id: Ie185a59262206118c0f97a6098f368c909ff524e --- gnu/packages/freedesktop.scm | 21 +++------------------ 1 file changed, 3 insertions(+), 18 deletions(-) diff --git a/gnu/packages/freedesktop.scm b/gnu/packages/freedesktop.scm index 89ba22b7b01..e729d0c66ee 100644 --- a/gnu/packages/freedesktop.scm +++ b/gnu/packages/freedesktop.scm @@ -2,7 +2,7 @@ ;;; Copyright © 2015 Andreas Enge ;;; Copyright © 2015 Sou Bunnbu ;;; Copyright © 2015, 2017 Andy Wingo -;;; Copyright © 2015-2017, 2019, 2021-2022 Ludovic Courtès +;;; Copyright © 2015-2017, 2019, 2021-2022, 2025 Ludovic Courtès ;;; Copyright © 2015, 2017, 2018, 2019, 2021, 2022, 2023 Ricardo Wurmus ;;; Copyright © 2015 David Hashe ;;; Copyright © 2016, 2017, 2019, 2021-2024 Efraim Flashner @@ -907,7 +907,6 @@ the freedesktop.org XDG Base Directory specification.") (package (name "elogind") (version "255.17") - (replacement elogind/fixed) (source (origin (method git-fetch) (uri (git-reference @@ -978,8 +977,8 @@ the freedesktop.org XDG Base Directory specification.") (add-after 'unpack 'fix-pkttyagent-path (lambda _ (substitute* "meson.build" - (("join_paths\\(bindir, 'pkttyagent'\\)") - "'\"/run/current-system/profile/bin/pkttyagent\"'")))) + (("bindir / 'pkttyagent'") + "'/run/current-system/profile/bin/pkttyagent'")))) (add-after 'unpack 'use-global-hook-directory ;; XXX There is no run-time setting to set this per-process, only a ;; build-time, hard-coded list of global directories. @@ -1094,20 +1093,6 @@ the org.freedesktop.login1 interface over the system bus, allowing other parts of a the system to know what users are logged in, and where.") (license license:lgpl2.1+))) -(define-public elogind/fixed - (hidden-package - (package - (inherit elogind) - (arguments - (substitute-keyword-arguments (package-arguments elogind) - ((#:phases phases) - #~(modify-phases #$phases - (replace 'fix-pkttyagent-path - (lambda _ - (substitute* "meson.build" - (("bindir / 'pkttyagent'") - "'/run/current-system/profile/bin/pkttyagent'"))))))))))) - (define-public basu (package (name "basu") -- cgit v1.3