forked from mirrors/nixpkgs
4eaf2f1114
This was caused by multiple things: First, the module-path was wrong in the release. Second, when modules tried to load stumpwm, asdf searched for its sources in /tmp/nix-build-*. Both of these issues are fixed by a nix-specific patch that tells adsf to *never* try to load stumpwm (and others) from the filesystem. This is fine as those modules are already available in the image anyway. We also refactor some stuff & clean up the build. Stumpish works now too.
17 lines
442 B
Diff
17 lines
442 B
Diff
diff --git a/make-image.lisp.in b/make-image.lisp.in
|
|
index 121e9d6..2210242 100644
|
|
--- a/make-image.lisp.in
|
|
+++ b/make-image.lisp.in
|
|
@@ -2,7 +2,10 @@
|
|
|
|
(load "load-stumpwm.lisp")
|
|
|
|
-#-ecl (stumpwm:set-module-dir "@CONTRIB_DIR@")
|
|
+(setf asdf::*immutable-systems*
|
|
+ (uiop:list-to-hash-set (asdf:already-loaded-systems)))
|
|
+
|
|
+#-ecl (stumpwm:set-module-dir "@MODULE_DIR@")
|
|
|
|
#+sbcl
|
|
(sb-ext:save-lisp-and-die "stumpwm" :toplevel (lambda ()
|