Merge branch 'master' into cliamp

Reviewed-on: #11

.gitea/workflows/publish-attic.yaml

@@ -69,11 +69,13 @@ jobs:
 
           NIXPKGS_ALLOW_UNFREE=1 nix build --impure --accept-flake-config --no-link --print-out-paths -L \
             ".#packages.${system}.atuinLatest" \
+            ".#packages.${system}.cliampLatest" \
             ".#packages.${system}.musicpresence" \
             ".#packages.${system}.vintage-story" \
             ".#packages.${system}.swaytreesave" \
             ".#packages.${system}.archon" \
             ".#packages.${system}.ani-cli-rs" \
+            ".#packages.${system}.opengoal" \
             | tee built-paths.txt
 
       - name: Push packages to Attic

overlays/atuin.nix

@@ -0,0 +1,43 @@
+final: prev:
+let
+  rustLatest = prev.rust-bin.stable.latest.default;
+  rustPlatform = prev.makeRustPlatform {
+    cargo = rustLatest;
+    rustc = rustLatest;
+  };
+in
+{
+  atuinLatest = (prev.atuin.override { inherit rustPlatform; }).overrideAttrs (oldAttrs: rec {
+    version = "18.19.0";
+
+    src = prev.fetchFromGitHub {
+      owner = "atuinsh";
+      repo = "atuin";
+      rev = "v${version}";
+      hash = "sha256-yAw+ty6FUnFbiRTdAe2QQHzj6uU24fZ/bEIXcHl/thg=";
+    };
+
+    cargoDeps = rustPlatform.fetchCargoVendor {
+      inherit src;
+      hash = "sha256-jirVe0+N5+UHZWioj8AipUhawMBameqEJJpa8HPTnfw=";
+    };
+
+    cargoBuildFeatures = [
+      "ai"
+      "client"
+      "clipboard"
+      "daemon"
+      "hex"
+      "sync"
+    ];
+    cargoCheckFeatures = cargoBuildFeatures;
+
+    preCheck = (oldAttrs.preCheck or "") + ''
+      export HOME="$TMPDIR"
+      export XDG_CONFIG_HOME="$TMPDIR/.config"
+      export XDG_DATA_HOME="$TMPDIR/.local/share"
+      export XDG_STATE_HOME="$TMPDIR/.local/state"
+      mkdir -p "$XDG_CONFIG_HOME" "$XDG_DATA_HOME" "$XDG_STATE_HOME"
+    '';
+  });
+}

overlays/cliamp.nix

@@ -0,0 +1,24 @@
+final: prev: {
+  cliampLatest = prev.cliamp.overrideAttrs (oldAttrs: rec {
+    version = "2.0.1";
+
+    src = prev.fetchFromGitHub {
+      owner = "bjarneo";
+      repo = "cliamp";
+      tag = "v${version}";
+      sha256 = "sha256-r7MrrcVt+/f+iPozn9jaczJmpPv431wAoW8LvHKBtB8=";
+    };
+
+    vendorHash = "sha256-rtwUWbft5XGEbuBCn0OMCn4TS5Ul+UXJNIqNOzXfU+M=";
+
+  buildInputs = with prev; [
+    libogg
+    libvorbis
+    flac
+    mpg123
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isLinux [
+    alsa-lib
+  ];
+  });
+}

overlays/container.nix

@@ -0,0 +1,10 @@
+final: prev: {
+  containerLatest = prev.container.overrideAttrs (oldAttrs: rec {
+    version = "1.3.1";
+
+    src = prev.fetchurl {
+      url = "https://github.com/apple/container/releases/download/${version}/container-${version}-installer-signed.pkg";
+      hash = "sha256-p8G515J9MIdfL2x70dDLBsLapspXzp6QpRROiY/fVKg=";
+    };
+  });
+}

overlays/default.nix

@@ -1,43 +1,6 @@
 final: prev:
-let
-  rustLatest = prev.rust-bin.stable.latest.default;
-  rustPlatform = prev.makeRustPlatform {
-    cargo = rustLatest;
-    rustc = rustLatest;
-  };
-in
-{
-  atuinLatest = (prev.atuin.override { inherit rustPlatform; }).overrideAttrs (oldAttrs: rec {
-    version = "18.19.0";
-
-    src = prev.fetchFromGitHub {
-      owner = "atuinsh";
-      repo = "atuin";
-      rev = "v${version}";
-      hash = "sha256-yAw+ty6FUnFbiRTdAe2QQHzj6uU24fZ/bEIXcHl/thg=";
-    };
-
-    cargoDeps = rustPlatform.fetchCargoVendor {
-      inherit src;
-      hash = "sha256-jirVe0+N5+UHZWioj8AipUhawMBameqEJJpa8HPTnfw=";
-    };
-
-    cargoBuildFeatures = [
-      "ai"
-      "client"
-      "clipboard"
-      "daemon"
-      "hex"
-      "sync"
-    ];
-    cargoCheckFeatures = cargoBuildFeatures;
-
-    preCheck = (oldAttrs.preCheck or "") + ''
-      export HOME="$TMPDIR"
-      export XDG_CONFIG_HOME="$TMPDIR/.config"
-      export XDG_DATA_HOME="$TMPDIR/.local/share"
-      export XDG_STATE_HOME="$TMPDIR/.local/state"
-      mkdir -p "$XDG_CONFIG_HOME" "$XDG_DATA_HOME" "$XDG_STATE_HOME"
-    '';
-  });
-}
+prev.lib.composeManyExtensions [
+  (import ./atuin.nix)
+  (import ./container.nix)
+  (import ./cliamp.nix)
+] final prev

pkgs/default.nix

@@ -1,10 +1,14 @@
 {
   pkgs,
   hildibrand ? null,
-  caitsith ? null
+  caitsith ? null,
 }:
 {
+  # any overlays we define here
   atuinLatest = pkgs.atuinLatest;
+  containerLatest = pkgs.containerLatest;
+  cliampLatest = pkgs.cliampLatest;
+
   # any packages that are added to pkgs and are inputs, we inherit them here
   inherit hildibrand;
   inherit caitsith;
@@ -17,4 +21,5 @@
   archon = pkgs.callPackage ./linux/archon.nix { };
   yubilock = pkgs.callPackage ./linux/yubilock/default.nix { };
   ani-cli-rs = pkgs.callPackage ./linux/ani-cli-rs.nix { };
+  opengoal = pkgs.callPackage ./linux/opengoal.nix { };
 }

pkgs/linux/opengoal.nix

@@ -0,0 +1,49 @@
+{ pkgs }:
+let
+  pname = "OpenGOAL-Launcher";
+  version = "2.10.4";
+
+  src = pkgs.fetchurl {
+    url = "https://github.com/open-goal/launcher/releases/download/v${version}/${pname}_${version}_amd64.AppImage";
+    hash = "sha256-eikzjdOYNdJM9FM3O/HuCFDzf97Fm1nhbRedDyKZ1/s=";
+  };
+in
+pkgs.stdenvNoCC.mkDerivation {
+  inherit pname version src;
+
+  nativeBuildInputs = [ pkgs.makeWrapper ];
+
+  dontUnpack = true;
+  dontPatchELF = true;
+
+  installPhase = ''
+    runHook preInstall
+
+    cp "$src" "${pname}.AppImage"
+    chmod +x "${pname}.AppImage"
+    ./"${pname}.AppImage" --appimage-extract
+
+    mkdir -p "$out/opt"
+    cp -a AppDir "$out/opt/opengoal-launcher"
+    rm -f "$out/opt/opengoal-launcher/share/icons/hicolor/scalable/apps/byobu.svg"
+
+    makeWrapper "$out/opt/opengoal-launcher/AppRun" "$out/bin/${pname}"
+    install -Dm444 "AppDir/${pname}.desktop" \
+      "$out/share/applications/${pname}.desktop"
+    install -Dm444 "AppDir/${pname}.png" \
+      "$out/share/icons/hicolor/256x256/apps/${pname}.png"
+
+    runHook postInstall
+  '';
+
+  passthru.updateScript = pkgs.nix-update-script { };
+
+  meta = with pkgs.lib; {
+    description = "Launcher for the OpenGOAL project";
+    homepage = "https://github.com/open-goal/launcher";
+    license = licenses.mit;
+    platforms = [ "x86_64-linux" ];
+    sourceProvenance = with sourceTypes; [ binaryNativeCode ];
+    mainProgram = pname;
+  };
+}