mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-12-25 03:17:13 +00:00
69cabf7750
Much improved build with support for GUI libraries and FUEL, the emacs development environment. Also directs the work vocabulary to point to /var/lib/factor as a machine-local writable location. So, scaffolding should work as intended, now.
25 lines
770 B
Diff
25 lines
770 B
Diff
diff --git a/core/io/pathnames/pathnames.factor b/core/io/pathnames/pathnames.factor
|
|
index 2d382e49d1..d4d9228d6c 100644
|
|
--- a/core/io/pathnames/pathnames.factor
|
|
+++ b/core/io/pathnames/pathnames.factor
|
|
@@ -144,7 +144,10 @@ GENERIC: vocab-path ( path -- newpath )
|
|
GENERIC: absolute-path ( path -- path' )
|
|
|
|
M: string absolute-path
|
|
- "resource:" ?head [
|
|
+ "resource:work" ?head [
|
|
+ trim-head-separators "/var/lib/factor" prepend-path
|
|
+ absolute-path ]
|
|
+ [ "resource:" ?head [
|
|
trim-head-separators resource-path
|
|
absolute-path
|
|
] [
|
|
@@ -158,6 +161,7 @@ M: string absolute-path
|
|
] [
|
|
current-directory get prepend-path
|
|
] if ] if
|
|
+ ] if
|
|
] if ;
|
|
|
|
M: object normalize-path ( path -- path' )
|