merge: conflict resolved

.gitea/workflows/publish-attic.yaml

@@ -62,10 +62,11 @@ jobs:
 
           system="$(nix eval --impure --raw --expr builtins.currentSystem)"
 
-          nix build --accept-flake-config --no-link --print-out-paths -L \
+          NIXPKGS_ALLOW_UNFREE=1 nix build --impure --accept-flake-config --no-link --print-out-paths -L \
             ".#packages.${system}.musicpresence" \
             ".#packages.${system}.vintage-story" \
             ".#packages.${system}.swaytreesave" \
+            ".#packages.${system}.archon" \
             | tee built-paths.txt
 
       - name: Push packages to Attic

pkgs/default.nix

@@ -1,8 +1,9 @@
 { pkgs }:
 {
   # sable-web = pkgs.callPackage ./common/sable.nix {};
-  swaytreesave = pkgs.callPackage ./linux/swaytreesave.nix { };
+  swaytreesave = pkgs.callPackage ./linux/swaytreesave.nix {};
-  musicpresence = pkgs.callPackage ./linux/musicpresence.nix { };
+  musicpresence = pkgs.callPackage ./linux/musicpresence.nix {};
-  vintage-story = pkgs.callPackage ./linux/vintage-story.nix { };
+  vintage-story = pkgs.callPackage ./linux/vintage-story.nix {};
+  archon = pkgs.callPackage ./linux/archon.nix {};
   yubilock = pkgs.callPackage ./linux/yubilock/default.nix { };
 }

pkgs/linux/archon.nix

@@ -0,0 +1,32 @@
+{ pkgs }:
+let
+  pname = "archon";
+  version = "9.3.119";
+
+  src = pkgs.fetchurl {
+    url = "https://github.com/RPGLogs/Uploaders-archon/releases/download/v${version}/${pname}-v${version}.AppImage";
+    hash = "sha256-mUsmaIxm3DZ1vvcwxpmDTWTj+UlFSv+jYkBrteL8xQk=";
+  };
+
+  appimageContents = pkgs.appimageTools.extract {
+    inherit pname version src;
+  };
+in
+pkgs.appimageTools.wrapType2 {
+  inherit pname version src;
+
+  nativeBuildInputs = with pkgs; [ makeWrapper ];
+  extraInstallCommands = ''
+    install -Dm444 "${appimageContents}/Archon App.desktop" "$out/share/applications/archon.desktop"
+    install -Dm444 "${appimageContents}/Archon App.png" "$out/share/icons/hicolor/256x256/apps/archon.png"
+  '';
+
+  meta = with pkgs.lib; {
+    description = "RPGLogs Archon uploader";
+    homepage = "https://github.com/RPGLogs/Uploaders-archon";
+    license = licenses.unfree;
+    platforms = platforms.linux;
+    sourceProvenance = with sourceTypes; [ binaryNativeCode ];
+    mainProgram = "archon";
+  };
+}