summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKasper GaƂkowski <k@galkowski.xyz>2023-05-20 01:28:05 +0200
committergithub-actions[bot] <github-actions[bot]@users.noreply.github.com>2023-05-29 08:39:03 +0000
commit7a7361e21a01f781a5d43d0d7646f8cc33d6672f (patch)
tree0b2d29c1c40f9f44cbf2a78eebec5d3fa5927329
parentMerge pull request #234748 from NixOS/backport-234729-to-release-23.05 (diff)
downloadnixpkgs-7a7361e21a01f781a5d43d0d7646f8cc33d6672f.tar.gz
stumpwm: Fix package conflict and HOME errors when loading modules
(cherry picked from commit fa8d4324f61a54c413cab259a9e14a8e968999e7)
-rw-r--r--pkgs/development/lisp-modules/packages.nix18
1 files changed, 16 insertions, 2 deletions
diff --git a/pkgs/development/lisp-modules/packages.nix b/pkgs/development/lisp-modules/packages.nix
index d7c801b716c2..db6251ee7e6a 100644
--- a/pkgs/development/lisp-modules/packages.nix
+++ b/pkgs/development/lisp-modules/packages.nix
@@ -322,13 +322,27 @@ let
};
buildScript = pkgs.writeText "build-stumpwm.lisp" ''
(load "${super.stumpwm.asdfFasl}/asdf.${super.stumpwm.faslExt}")
- (asdf:load-system 'stumpwm/build)
+
+ (asdf:load-system 'stumpwm)
+
+ ;; Prevents package conflict error
+ (when (uiop:version<= "3.1.5" (asdf:asdf-version))
+ (uiop:symbol-call '#:asdf '#:register-immutable-system :stumpwm)
+ (dolist (system-name (uiop:symbol-call '#:asdf
+ '#:system-depends-on
+ (asdf:find-system :stumpwm)))
+ (uiop:symbol-call '#:asdf '#:register-immutable-system system-name)))
+
+ ;; Prevents "cannot create /homeless-shelter" error
+ (asdf:disable-output-translations)
+
(sb-ext:save-lisp-and-die
"stumpwm"
:executable t
+ :purify t
#+sb-core-compression :compression
#+sb-core-compression t
- :toplevel #'stumpwm:main)
+ :toplevel #'stumpwm:stumpwm)
'';
installPhase = ''
mkdir -p $out/bin