Commit 8d999d48 authored by spacefrogg's avatar spacefrogg
Browse files

factor: Fix "resource:work" pointing to store

The necessary changes to io.pathnames absolute-path did not end up in
the final factor image. Build a local boot image and bootstrap factor
twice to make it contain all build modifications.

Fixes #212254
parent 032df61b
Loading
Loading
Loading
Loading
+6 −0
Original line number Diff line number Diff line
@@ -150,6 +150,11 @@ stdenv.mkDerivation {
      done)> $out/lib/factor/ld.so.cache

    make -j$NIX_BUILD_CORES linux-x86-64
    printf "First build from upstream boot image\n" >&2
    ./build.sh bootstrap
    printf "Rebuild boot image\n" >&2
    ./factor -script -e='"unix-x86.64" USING: system bootstrap.image memory ; make-image save 0 exit'
    printf "Second build from local boot image\n" >&2
    ./build.sh bootstrap
    runHook postBuild
  '';
@@ -214,5 +219,6 @@ stdenv.mkDerivation {
    license = licenses.bsd2;
    maintainers = with maintainers; [ vrthra spacefrogg ];
    platforms = lib.intersectLists platforms.x86_64 platforms.linux;
    mainProgram = "factor";
  };
}