3
0
Fork 0
forked from mirrors/nixpkgs
nixpkgs/pkgs/development/compilers/factor-lang/workdir-0.98-pre.patch
Michael Raitza 69cabf7750 factor-lang: 0.97 -> 0.98
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.
2018-10-20 02:51:35 +02:00

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' )