diff options
author | goibhniu <cillian.deroiste@gmail.com> | 2015-11-09 09:50:51 +0100 |
---|---|---|
committer | goibhniu <cillian.deroiste@gmail.com> | 2015-11-09 09:50:51 +0100 |
commit | ac3ad9515a509a65a894e7282c1fd0926b08cfd4 (patch) | |
tree | faae85f48f64aa49ab9511ecaf4d1e0a103ab5f5 /pkgs | |
parent | 2583b323c529210d49f6ba4e4c10a07b3ed54dc9 (diff) | |
parent | 5623e1b145a8c1b42c41c5dd163804cca0064b75 (diff) |
Merge pull request #10908 from robgssp/master
New package: clfswm
Diffstat (limited to 'pkgs')
-rw-r--r-- | pkgs/applications/window-managers/clfswm/default.nix | 43 | ||||
-rw-r--r-- | pkgs/applications/window-managers/clfswm/require-clx.patch | 13 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 2 |
3 files changed, 58 insertions, 0 deletions
diff --git a/pkgs/applications/window-managers/clfswm/default.nix b/pkgs/applications/window-managers/clfswm/default.nix new file mode 100644 index 0000000000000..6eb55348e6004 --- /dev/null +++ b/pkgs/applications/window-managers/clfswm/default.nix @@ -0,0 +1,43 @@ +{ stdenv, pkgs, fetchgit, autoconf, sbcl, lispPackages, xdpyinfo, texinfo4 +, makeWrapper , rlwrap, gnused, gnugrep, coreutils, xprop +, extraModulePaths ? [] }: + +stdenv.mkDerivation rec { + name = "clfswm"; + + src = fetchgit { + url = "https://gitlab.common-lisp.net/clfswm/clfswm.git"; + rev = "refs/heads/master"; + sha256 = "1hkm6bn5xww932w34l13bg87m5hsnwnd0i1lka6sw0cq8whndya0"; + }; + + buildInputs = [ + texinfo4 makeWrapper autoconf + sbcl + lispPackages.clx + lispPackages.cl-ppcre + xdpyinfo + ]; + + patches = [ ./require-clx.patch ]; + + # Stripping destroys the generated SBCL image + dontStrip = true; + + installPhase = '' + mkdir -pv $out/bin + make DESTDIR=$out install + + # Paths in the compressed image $out/bin/clfswm are not + # recognized by Nix. Add explicit reference here. + mkdir $out/nix-support + echo ${xdpyinfo} ${lispPackages.clx} ${lispPackages.cl-ppcre} > $out/nix-support/depends + ''; + + meta = with stdenv.lib; { + description = "A(nother) Common Lisp FullScreen Window Manager"; + homepage = https://common-lisp.net/project/clfswm/; + license = licenses.gpl3; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/window-managers/clfswm/require-clx.patch b/pkgs/applications/window-managers/clfswm/require-clx.patch new file mode 100644 index 0000000000000..ae2234461d25d --- /dev/null +++ b/pkgs/applications/window-managers/clfswm/require-clx.patch @@ -0,0 +1,13 @@ +diff --git a/load.lisp b/load.lisp +index c8c4cf0..8c9ca2e 100644 +--- a/load.lisp ++++ b/load.lisp +@@ -111,6 +111,8 @@ from $XDG_CONFIG_HOME/clfswm/clfswmrc") + ;;;------------------ + (load-info "Requiring CLX") + ++(require 'clx) ++ + ;;; Loading clisp dynamic module. This part needs clisp >= 2.50 + ;;#+(AND CLISP (not CLX)) + ;;(when (fboundp 'require) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0999f17fc582d..8c9dae0af5143 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11093,6 +11093,8 @@ let enableNetworkManager = config.networking.networkmanager.enable or false; }; + clfswm = callPackage ../applications/window-managers/clfswm { }; + clipgrab = callPackage ../applications/video/clipgrab { }; clipit = callPackage ../applications/misc/clipit { }; |