summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--nixos/modules/services/x11/window-managers/clfswm.nix2
-rw-r--r--pkgs/development/lisp-modules/packages.nix17
2 files changed, 18 insertions, 1 deletions
diff --git a/nixos/modules/services/x11/window-managers/clfswm.nix b/nixos/modules/services/x11/window-managers/clfswm.nix
index 5500c77a038b..09b49962f2ad 100644
--- a/nixos/modules/services/x11/window-managers/clfswm.nix
+++ b/nixos/modules/services/x11/window-managers/clfswm.nix
@@ -10,7 +10,7 @@ in
options = {
services.xserver.windowManager.clfswm = {
enable = mkEnableOption "clfswm";
- package = mkPackageOption pkgs [ "lispPackages" "clfswm" ] { };
+ package = mkPackageOption pkgs [ "sbclPackages" "clfswm" ] { };
};
};
diff --git a/pkgs/development/lisp-modules/packages.nix b/pkgs/development/lisp-modules/packages.nix
index fbee5e84d00f..230bc47bcea8 100644
--- a/pkgs/development/lisp-modules/packages.nix
+++ b/pkgs/development/lisp-modules/packages.nix
@@ -573,6 +573,23 @@ let
stumpwm-unwrapped = super.stumpwm;
+ clfswm = super.clfswm.overrideAttrs (o: rec {
+ buildScript = pkgs.writeText "build-clfswm.lisp" ''
+ (load "${o.asdfFasl}/asdf.${o.faslExt}")
+ (asdf:load-system 'clfswm)
+ (sb-ext:save-lisp-and-die
+ "clfswm"
+ :executable t
+ #+sb-core-compression :compression
+ #+sb-core-compression t
+ :toplevel #'clfswm:main)
+ '';
+ installPhase = o.installPhase + ''
+ mkdir -p $out/bin
+ mv $out/clfswm $out/bin
+ '';
+ });
+
ltk = super.ltk.overrideLispAttrs (o: {
src = pkgs.fetchzip {
url = "https://github.com/uthar/ltk/archive/f19162e76d6c7c2f51bd289b811d9ba20dd6555e.tar.gz";