From 880ada0bdb9e694573ec42200d48658b27744b9b Mon Sep 17 00:00:00 2001 From: kiasoc5 Date: Mon, 5 Jun 2023 19:18:20 -0400 Subject: gnu: Move stalonetray to (gnu packages xdisorg). MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit See . * gnu/packages/stalonetray.scm (stalonetray): Move from here… * gnu/packages/xdisorg.scm (stalonetray): …to here. * gnu/local.mk (GNU_SYSTEM_MODULES): Adjust accordingly. Signed-off-by: Ludovic Courtès --- gnu/local.mk | 1 - gnu/packages/stalonetray.scm | 69 -------------------------------------------- gnu/packages/xdisorg.scm | 41 ++++++++++++++++++++++++++ 3 files changed, 41 insertions(+), 70 deletions(-) delete mode 100644 gnu/packages/stalonetray.scm diff --git a/gnu/local.mk b/gnu/local.mk index 5ed399adb0..9b75e16fb3 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -588,7 +588,6 @@ GNU_SYSTEM_MODULES = \ %D%/packages/squirrel.scm \ %D%/packages/ssh.scm \ %D%/packages/sssd.scm \ - %D%/packages/stalonetray.scm \ %D%/packages/statistics.scm \ %D%/packages/stb.scm \ %D%/packages/stenography.scm \ diff --git a/gnu/packages/stalonetray.scm b/gnu/packages/stalonetray.scm deleted file mode 100644 index 37b5cdaae3..0000000000 --- a/gnu/packages/stalonetray.scm +++ /dev/null @@ -1,69 +0,0 @@ -;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2014 Raimon Grau -;;; Copyright © 2016 Efraim Flashner -;;; -;;; This file is part of GNU Guix. -;;; -;;; GNU Guix is free software; you can redistribute it and/or modify it -;;; under the terms of the GNU General Public License as published by -;;; the Free Software Foundation; either version 3 of the License, or (at -;;; your option) any later version. -;;; -;;; GNU Guix is distributed in the hope that it will be useful, but -;;; WITHOUT ANY WARRANTY; without even the implied warranty of -;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -;;; GNU General Public License for more details. -;;; -;;; You should have received a copy of the GNU General Public License -;;; along with GNU Guix. If not, see . - -(define-module (gnu packages stalonetray) - #:use-module (guix gexp) - #:use-module (guix packages) - #:use-module (guix git-download) - #:use-module (guix build-system gnu) - #:use-module ((guix licenses) #:select (gpl2+)) - #:use-module (gnu packages autotools) - #:use-module (gnu packages docbook) - #:use-module (gnu packages xml) - #:use-module (gnu packages xorg)) - -(define-public stalonetray - (package - (name "stalonetray") - (version "0.8.5") - (source - (origin - (method git-fetch) - (uri - (git-reference - (url "https://github.com/kolbusa/stalonetray") - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "074wy1xppfycillbxq6fwrq87ik9glc95083df5vgm20mhzni7pz")))) - (arguments - (list - #:phases - #~(modify-phases %standard-phases - (add-after 'unpack 'fix-docbook-root - (lambda _ - (substitute* "configure.ac" - (("AC_SUBST\\(DOCBOOK_ROOT\\)" all) - (string-append "DOCBOOK_ROOT=" - #$(this-package-native-input "docbook-xsl") - "/xml/xsl/docbook-xsl-" - #$(package-version (this-package-native-input "docbook-xsl")) - "; " all)))))))) - (inputs (list libx11 libxpm)) - (native-inputs (list autoconf automake libxslt docbook-xsl)) - (build-system gnu-build-system) - (home-page "https://kolbusa.github.io/stalonetray") - (synopsis "Standalone freedesktop.org and KDE systray implementation") - (description - "Stalonetray is a stand-alone freedesktop.org and KDE system -tray (notification area) for X Window System/X11 (e.g. X.Org or XFree86). It -has full XEMBED support and minimal dependencies: an X11 lib only. Stalonetray -works with virtually any EWMH-compliant window manager.") - (license gpl2+))) diff --git a/gnu/packages/xdisorg.scm b/gnu/packages/xdisorg.scm index e9167eab5f..32afa3a921 100644 --- a/gnu/packages/xdisorg.scm +++ b/gnu/packages/xdisorg.scm @@ -103,6 +103,7 @@ #:use-module (gnu packages compression) #:use-module (gnu packages cpp) #:use-module (gnu packages datastructures) + #:use-module (gnu packages docbook) #:use-module (gnu packages documentation) #:use-module (gnu packages flex) #:use-module (gnu packages fontutils) @@ -2053,6 +2054,46 @@ border, and background. It also supports multihead setups, customized mouse actions, a built-in clock, a battery monitor and a system tray.") (license license:gpl2))) +(define-public stalonetray + (package + (name "stalonetray") + (version "0.8.5") + (source + (origin + (method git-fetch) + (uri + (git-reference + (url "https://github.com/kolbusa/stalonetray") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "074wy1xppfycillbxq6fwrq87ik9glc95083df5vgm20mhzni7pz")))) + (arguments + (list + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'fix-docbook-root + (lambda _ + (substitute* "configure.ac" + (("AC_SUBST\\(DOCBOOK_ROOT\\)" all) + (string-append "DOCBOOK_ROOT=" + #$(this-package-native-input "docbook-xsl") + "/xml/xsl/docbook-xsl-" + #$(package-version (this-package-native-input "docbook-xsl")) + "; " all)))))))) + (inputs (list libx11 libxpm)) + (native-inputs (list autoconf automake docbook-xsl libxslt)) + (build-system gnu-build-system) + (home-page "https://kolbusa.github.io/stalonetray") + (synopsis "Standalone freedesktop.org and KDE systray implementation") + (description + "Stalonetray is a stand-alone freedesktop.org and KDE system +tray (notification area) for X Window System/X11 (e.g. X.Org or XFree86). It +has full XEMBED support and minimal dependencies: an X11 lib only. Stalonetray +works with virtually any EWMH-compliant window manager.") + (license license:gpl2+))) + (define-public tofi (package (name "tofi") -- cgit v1.2.3