From 29f3d5eed5d6e257b1c0cb1288c6475167e2ff2e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Th=C3=A9o=20Barnouin?= <theo.barnouin@protonmail.com>
Date: Thu, 14 Nov 2024 10:29:44 +0100
Subject: [PATCH] Don't use flake but a simple package

---
 default.nix | 85 +++++++++++++++++++++++++++++++++++++++++++++++++++++
 flake.lock  | 12 ++++----
 flake.nix   | 10 +++----
 3 files changed, 96 insertions(+), 11 deletions(-)
 create mode 100644 default.nix

diff --git a/default.nix b/default.nix
new file mode 100644
index 0000000..e96dcf1
--- /dev/null
+++ b/default.nix
@@ -0,0 +1,85 @@
+{ lib
+, stdenv
+, fetchFromGitea
+, nix-update-script
+, meson
+, ninja
+, gettext
+, desktop-file-utils
+, cargo
+, rustPlatform
+, rustc
+, pkg-config
+, glib
+, libadwaita
+, libhandy
+, gtk4
+, openssl
+, alsa-lib
+, libpulseaudio
+, wrapGAppsHook4
+, blueprint-compiler
+, gst_all_1
+}:
+
+stdenv.mkDerivation rec {
+  pname = "spot";
+  version = "0.6.0";
+
+  src = fetchFromGitea {
+    domain = "git.le43.eu";
+    owner = "tbarnouin";
+    repo = "spot";
+    rev = "main";
+    hash = "sha256-C/HeqN1Y/bNYWx3WsqIKf6rjLBI3TPs5h+kLClvurYQ=";
+  };
+
+  cargoDeps = rustPlatform.fetchCargoTarball {
+    inherit src;
+    name = "${pname}-${version}";
+    hash = "sha256-HIjA+oDFegsnnV3EViaWfsNhmqPB1yl8rIVS5LbTu/A=";
+  };
+
+  nativeBuildInputs = [
+    gettext
+    meson
+    ninja
+    pkg-config
+    gtk4 # for gtk-update-icon-cache
+    glib # for glib-compile-schemas
+    desktop-file-utils
+    cargo
+    rustPlatform.cargoSetupHook
+    rustc
+    wrapGAppsHook4
+    blueprint-compiler
+  ];
+
+  buildInputs = [
+    glib
+    gtk4
+    libadwaita
+    libhandy
+    openssl
+    alsa-lib
+    libpulseaudio
+    gst_all_1.gst-plugins-base
+    gst_all_1.gstreamer
+  ];
+
+  # https://github.com/xou816/spot/issues/313
+  mesonBuildType = "release";
+
+  passthru = {
+    updateScript = nix-update-script { };
+  };
+
+  meta = with lib; {
+    description = "Native Spotify client for the GNOME desktop";
+    mainProgram = "spot";
+    homepage = "https://github.com/xou816/spot";
+    license = licenses.mit;
+    maintainers = [ ];
+    platforms = platforms.linux;
+  };
+}
diff --git a/flake.lock b/flake.lock
index 7f725e5..74cb68a 100644
--- a/flake.lock
+++ b/flake.lock
@@ -35,16 +35,16 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1731245184,
-        "narHash": "sha256-vmLS8+x+gHRv1yzj3n+GTAEObwmhxmkkukB2DwtJRdU=",
-        "owner": "nixos",
+        "lastModified": 1731386116,
+        "narHash": "sha256-lKA770aUmjPHdTaJWnP3yQ9OI1TigenUqVC3wweqZuI=",
+        "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "aebe249544837ce42588aa4b2e7972222ba12e8f",
+        "rev": "689fed12a013f56d4c4d3f612489634267d86529",
         "type": "github"
       },
       "original": {
-        "owner": "nixos",
-        "ref": "nixpkgs-unstable",
+        "owner": "NixOS",
+        "ref": "nixos-24.05",
         "repo": "nixpkgs",
         "type": "github"
       }
diff --git a/flake.nix b/flake.nix
index 94b5146..ae5b9f2 100644
--- a/flake.nix
+++ b/flake.nix
@@ -1,9 +1,9 @@
 {
-  description = "A GUI for yt-dlp written in Rust";
+  description = "A Spotify client for Gnome";
 
   inputs = {
     flake-utils.url = "github:numtide/flake-utils";
-    nixpkgs.url = "github:nixos/nixpkgs?ref=nixpkgs-unstable";
+    nixpkgs.url = "github:NixOS/nixpkgs/nixos-24.05";
     rust-overlay.url = "github:oxalica/rust-overlay";
     crane = {
       url = "github:ipetkov/crane";
@@ -52,6 +52,9 @@
           gst_all_1.gstreamer
         ];
 
+        cargoLock = {
+          lockFile = "./Cargo.lock";
+        };
 
         cargoArtifacts = craneLib.buildDepsOnly ({
           src = craneLib.cleanCargoSource (craneLib.path ./.);
@@ -62,10 +65,7 @@
         packages = rec {
           spot = craneLib.buildPackage {
             src = craneLib.path ./.;
-            cargoHash = "";
-
             inherit buildInputs nativeBuildInputs cargoArtifacts;
-
           };
 
           default = spot;