Merge pull request #232913 from Uthar/stumpwm-fixes2
stumpwm: fix package conflict and HOME errors when loading modules
This commit is contained in:
commit
a4a8624d74
|
@ -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
|
||||
|
@ -336,6 +350,8 @@ let
|
|||
'';
|
||||
});
|
||||
|
||||
stumpwm-unwrapped = super.stumpwm;
|
||||
|
||||
ltk = super.ltk.overrideLispAttrs (o: {
|
||||
src = pkgs.fetchzip {
|
||||
url = "https://github.com/uthar/ltk/archive/f19162e76d6c7c2f51bd289b811d9ba20dd6555e.tar.gz";
|
||||
|
|
|
@ -34380,6 +34380,8 @@ with pkgs;
|
|||
|
||||
stumpwm = sbclPackages.stumpwm;
|
||||
|
||||
stumpwm-unwrapped = sbclPackages.stumpwm-unwrapped;
|
||||
|
||||
sublime = callPackage ../applications/editors/sublime/2 { };
|
||||
|
||||
sublime3Packages = recurseIntoAttrs (callPackage ../applications/editors/sublime/3/packages.nix { });
|
||||
|
|
Loading…
Reference in a new issue