diff --git a/nixos/modules/services/x11/window-managers/stumpwm.nix b/nixos/modules/services/x11/window-managers/stumpwm.nix index 162af689dbba..c6fc49f5821b 100644 --- a/nixos/modules/services/x11/window-managers/stumpwm.nix +++ b/nixos/modules/services/x11/window-managers/stumpwm.nix @@ -15,10 +15,10 @@ in services.xserver.windowManager.session = singleton { name = "stumpwm"; start = '' - ${pkgs.lispPackages.stumpwm}/bin/stumpwm & + ${pkgs.sbclPackages.stumpwm}/bin/stumpwm & waitPID=$! ''; }; - environment.systemPackages = [ pkgs.lispPackages.stumpwm ]; + environment.systemPackages = [ pkgs.sbclPackages.stumpwm ]; }; } diff --git a/pkgs/development/lisp-modules/packages.nix b/pkgs/development/lisp-modules/packages.nix index f989c2f45993..d3e85628a84e 100644 --- a/pkgs/development/lisp-modules/packages.nix +++ b/pkgs/development/lisp-modules/packages.nix @@ -311,6 +311,30 @@ let nyxt = self.nyxt-gtk; + stumpwm = super.stumpwm.overrideLispAttrs (o: rec { + version = "22.11"; + src = pkgs.fetchFromGitHub { + owner = "stumpwm"; + repo = "stumpwm"; + rev = version; + hash = "sha256-zXj17ucgyFhv7P0qEr4cYSVRPGrL1KEIofXWN2trr/M="; + }; + buildScript = pkgs.writeText "build-stumpwm.lisp" '' + (load "${super.stumpwm.asdfFasl}/asdf.${super.stumpwm.faslExt}") + (asdf:load-system 'stumpwm/build) + (sb-ext:save-lisp-and-die + "stumpwm" + :executable t + #+sb-core-compression :compression + #+sb-core-compression t + :toplevel #'stumpwm:main) + ''; + installPhase = '' + mkdir -p $out/bin + cp -v stumpwm $out/bin + ''; + }); + ltk = super.ltk.overrideLispAttrs (o: { src = pkgs.fetchzip { url = "https://github.com/uthar/ltk/archive/f19162e76d6c7c2f51bd289b811d9ba20dd6555e.tar.gz"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3f4cb29bb3a9..e7b83d9dda5f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -33231,7 +33231,7 @@ with pkgs; stumpish = callPackage ../applications/window-managers/stumpish {}; - stumpwm = lispPackages.stumpwm; + stumpwm = sbclPackages.stumpwm; sublime = callPackage ../applications/editors/sublime/2 { };