Merge pull request #3137 from atlas-engineer/fix-source-code-on-flatpak

Fix source code on flatpak

engineer.atlas.Nyxt.yaml

@@ -22,17 +22,19 @@ finish-args:
   - --filesystem=xdg-videos
   - --filesystem=xdg-pictures
   - --talk-name=org.a11y.Bus
+  # See http://sbcl.org/getting.html
+  - --env=SBCL_HOME="/app/lib/sbcl"
 
 modules:
   - name: sbcl
     buildsystem: simple
     sources:
       - type: archive
-        url: http://prdownloads.sourceforge.net/sbcl/sbcl-2.3.2-x86-64-linux-binary.tar.bz2
-        sha256: 4cf817f1d889244b5ebd4dbf7208d7f66a38a8300b4eb7e823e3b304cfefde11
+        url: http://prdownloads.sourceforge.net/sbcl/sbcl-2.3.7-x86-64-linux-binary.tar.bz2
+        sha256: 24b38951712a08a3220cac289e6d89692e26d345fd62d9d99c6fc49618cebe8c
     build-options:
       env:
-        BUILD_ROOT: "/app/sbcl"
+        INSTALL_ROOT: /app
     build-commands:
       - sh install.sh
 
@@ -69,13 +71,11 @@ modules:
     sources:
       - type: dir
         path: .
-    build-options:
-      env:
-        LISP: "/app/sbcl/usr/local/bin/sbcl"
-        LISP_FLAGS: "--dynamic-space-size 4096 --no-userinit --non-interactive"
-        FLATPAK_ID: "engineer.atlas.Nyxt"
     build-commands:
       - make all
       - mkdir -p $FLATPAK_DEST/bin
       - mv nyxt $FLATPAK_DEST/bin/
       - install -D assets/engineer.atlas.Nyxt.appdata.xml /app/share/appdata/engineer.atlas.Nyxt.appdata.xml
+      # See method files:resolve that specializes nyxt-source-directory
+      - mkdir -p $FLATPAK_DEST/share/nyxt
+      - mv * $FLATPAK_DEST/share/nyxt

source/changelog.lisp

@@ -831,7 +831,8 @@ Chromium, Brave and Vivaldi. For instance, "
   ;;    (:li "")))
   (:nsection :title "Bug fixes"
     (:ul
-     (:li "Fix clipboard facilities on X11 and Wayland.")))
+     (:li "Fix clipboard facilities on X11 and Wayland.")
+     (:li "Fix source code location on Flatpak.")))
   ;; (:nsection :title "UI/UX"
   ;;   (:ul
   ;;    (:li "")))