From 5fd66a37d58aa13091134d5e6e5f8c62f404ebfe Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 31 Aug 2016 14:07:15 +0100 Subject: gnu: slim: Move to display-managers.scm. * gnu/packages/display-managers.scm: New file. * gnu/packages/slim.scm: Delete file. * gnu/local.mk (GNU_SYSTEM_MODULES): Adjust accordingly. * gnu/services/xorg.scm: Likewise. --- gnu/local.mk | 2 +- gnu/packages/display-managers.scm | 95 +++++++++++++++++++++++++++++++++++++++ gnu/packages/slim.scm | 95 --------------------------------------- gnu/services/xorg.scm | 2 +- 4 files changed, 97 insertions(+), 97 deletions(-) create mode 100644 gnu/packages/display-managers.scm delete mode 100644 gnu/packages/slim.scm diff --git a/gnu/local.mk b/gnu/local.mk index 457dc1965d..5b90dfbfdd 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -96,6 +96,7 @@ GNU_SYSTEM_MODULES = \ %D%/packages/dictionaries.scm \ %D%/packages/dillo.scm \ %D%/packages/disk.scm \ + %D%/packages/display-managers.scm \ %D%/packages/djvu.scm \ %D%/packages/dns.scm \ %D%/packages/docbook.scm \ @@ -320,7 +321,6 @@ GNU_SYSTEM_MODULES = \ %D%/packages/skarnet.scm \ %D%/packages/skribilo.scm \ %D%/packages/slang.scm \ - %D%/packages/slim.scm \ %D%/packages/smalltalk.scm \ %D%/packages/speech.scm \ %D%/packages/spice.scm \ diff --git a/gnu/packages/display-managers.scm b/gnu/packages/display-managers.scm new file mode 100644 index 0000000000..579b149a0c --- /dev/null +++ b/gnu/packages/display-managers.scm @@ -0,0 +1,95 @@ +;;; GNU Guix --- Functional package management for GNU +;;; Copyright © 2013 Joshua Grant +;;; Copyright © 2014 Ludovic Courtès +;;; Copyright © 2014 Andreas Enge +;;; +;;; 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 display-managers) + #:use-module ((guix licenses) #:prefix l:) + #:use-module (guix packages) + #:use-module (guix download) + #:use-module (guix build-system cmake) + #:use-module (guix packages) + #:use-module (gnu packages) + #:use-module (gnu packages gl) + #:use-module (gnu packages xorg) + #:use-module (gnu packages image) + #:use-module (gnu packages fontutils) + #:use-module (gnu packages pkg-config) + #:use-module (gnu packages linux)) + +(define-public slim + (package + (name "slim") + (version "1.3.6") + (source (origin + (method url-fetch) + ;; Used to be available from download.berlios.de. + (uri (string-append + "mirror://sourceforge/slim.berlios/slim-" + version ".tar.gz")) + (sha256 + (base32 "1pqhk22jb4aja4hkrm7rjgbgzjyh7i4zswdgf5nw862l2znzxpi1")) + (patches (search-patches "slim-config.patch" + "slim-session.patch" + "slim-sigusr1.patch")))) + (build-system cmake-build-system) + (inputs `(("linux-pam" ,linux-pam) + ("libpng" ,libpng) + ("libjpeg" ,libjpeg) + ("freeglut" ,freeglut) + ("libxrandr" ,libxrandr) + ("libxrender" ,libxrender) + ("freetype" ,freetype) + ("fontconfig" ,fontconfig) + ("libx11" ,libx11) + ("libxft" ,libxft) + ("libxmu" ,libxmu) + ("xauth" ,xauth))) + (native-inputs + `(("pkg-config" ,pkg-config))) + (arguments + '(#:phases (alist-cons-before + 'configure 'set-new-etc-location + (lambda _ + (substitute* "CMakeLists.txt" + (("/etc") + (string-append (assoc-ref %outputs "out") "/etc")) + (("install.*systemd.*") + ;; The build system's logic here is: if "Linux", then + ;; "systemd". Strip that. + ""))) + %standard-phases) + #:configure-flags '("-DUSE_PAM=yes" + "-DUSE_CONSOLEKIT=no") + #:tests? #f)) + + ;; This used to be at . + (home-page "http://sourceforge.net/projects/slim.berlios/") + (synopsis "Desktop-independent graphical login manager for X11") + (description + "SLiM is a Desktop-independent graphical login manager for X11, derived +from Login.app. It aims to be light and simple, although completely +configurable through themes and an option file; is suitable for machines on +which remote login functionalities are not needed. + +Features included: PNG and XFT support for alpha transparency and antialiased +fonts, External themes support, Configurable runtime options: X server -- +login / shutdown / reboot commands, Single (GDM-like) or double (XDM-like) +input control, Can load predefined user at startup, Configurable welcome / +shutdown messages, Random theme selection.") + (license l:gpl2))) diff --git a/gnu/packages/slim.scm b/gnu/packages/slim.scm deleted file mode 100644 index 2328a1aacf..0000000000 --- a/gnu/packages/slim.scm +++ /dev/null @@ -1,95 +0,0 @@ -;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2013 Joshua Grant -;;; Copyright © 2014 Ludovic Courtès -;;; Copyright © 2014 Andreas Enge -;;; -;;; 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 slim) - #:use-module ((guix licenses) #:prefix l:) - #:use-module (guix packages) - #:use-module (guix download) - #:use-module (guix build-system cmake) - #:use-module (guix packages) - #:use-module (gnu packages) - #:use-module (gnu packages gl) - #:use-module (gnu packages xorg) - #:use-module (gnu packages image) - #:use-module (gnu packages fontutils) - #:use-module (gnu packages pkg-config) - #:use-module (gnu packages linux)) - -(define-public slim - (package - (name "slim") - (version "1.3.6") - (source (origin - (method url-fetch) - ;; Used to be available from download.berlios.de. - (uri (string-append - "mirror://sourceforge/slim.berlios/slim-" - version ".tar.gz")) - (sha256 - (base32 "1pqhk22jb4aja4hkrm7rjgbgzjyh7i4zswdgf5nw862l2znzxpi1")) - (patches (search-patches "slim-config.patch" - "slim-session.patch" - "slim-sigusr1.patch")))) - (build-system cmake-build-system) - (inputs `(("linux-pam" ,linux-pam) - ("libpng" ,libpng) - ("libjpeg" ,libjpeg) - ("freeglut" ,freeglut) - ("libxrandr" ,libxrandr) - ("libxrender" ,libxrender) - ("freetype" ,freetype) - ("fontconfig" ,fontconfig) - ("libx11" ,libx11) - ("libxft" ,libxft) - ("libxmu" ,libxmu) - ("xauth" ,xauth))) - (native-inputs - `(("pkg-config" ,pkg-config))) - (arguments - '(#:phases (alist-cons-before - 'configure 'set-new-etc-location - (lambda _ - (substitute* "CMakeLists.txt" - (("/etc") - (string-append (assoc-ref %outputs "out") "/etc")) - (("install.*systemd.*") - ;; The build system's logic here is: if "Linux", then - ;; "systemd". Strip that. - ""))) - %standard-phases) - #:configure-flags '("-DUSE_PAM=yes" - "-DUSE_CONSOLEKIT=no") - #:tests? #f)) - - ;; This used to be at . - (home-page "http://sourceforge.net/projects/slim.berlios/") - (synopsis "Desktop-independent graphical login manager for X11") - (description - "SLiM is a Desktop-independent graphical login manager for X11, derived -from Login.app. It aims to be light and simple, although completely -configurable through themes and an option file; is suitable for machines on -which remote login functionalities are not needed. - -Features included: PNG and XFT support for alpha transparency and antialiased -fonts, External themes support, Configurable runtime options: X server -- -login / shutdown / reboot commands, Single (GDM-like) or double (XDM-like) -input control, Can load predefined user at startup, Configurable welcome / -shutdown messages, Random theme selection.") - (license l:gpl2))) diff --git a/gnu/services/xorg.scm b/gnu/services/xorg.scm index 905c88ff66..4e311deb84 100644 --- a/gnu/services/xorg.scm +++ b/gnu/services/xorg.scm @@ -26,7 +26,7 @@ #:use-module (gnu packages guile) #:use-module (gnu packages xorg) #:use-module (gnu packages gl) - #:use-module (gnu packages slim) + #:use-module (gnu packages display-managers) #:use-module (gnu packages gnustep) #:use-module (gnu packages admin) #:use-module (gnu packages bash) -- cgit v1.2.3