Compare commits

..

No commits in common. "29f3d5eed5d6e257b1c0cb1288c6475167e2ff2e" and "112d9d453cd65163f50139e168c85e9c28f4ddeb" have entirely different histories.

4 changed files with 12 additions and 98 deletions

3
.gitignore vendored
View file

@ -5,5 +5,4 @@
/.flatpak-builder/ /.flatpak-builder/
/src/config.rs /src/config.rs
/subprojects/blueprint-compiler /subprojects/blueprint-compiler
result result/
/result/

View file

@ -1,85 +0,0 @@
{ 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;
};
}

View file

@ -35,16 +35,16 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1731386116, "lastModified": 1731245184,
"narHash": "sha256-lKA770aUmjPHdTaJWnP3yQ9OI1TigenUqVC3wweqZuI=", "narHash": "sha256-vmLS8+x+gHRv1yzj3n+GTAEObwmhxmkkukB2DwtJRdU=",
"owner": "NixOS", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "689fed12a013f56d4c4d3f612489634267d86529", "rev": "aebe249544837ce42588aa4b2e7972222ba12e8f",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "NixOS", "owner": "nixos",
"ref": "nixos-24.05", "ref": "nixpkgs-unstable",
"repo": "nixpkgs", "repo": "nixpkgs",
"type": "github" "type": "github"
} }

View file

@ -1,9 +1,9 @@
{ {
description = "A Spotify client for Gnome"; description = "A GUI for yt-dlp written in Rust";
inputs = { inputs = {
flake-utils.url = "github:numtide/flake-utils"; flake-utils.url = "github:numtide/flake-utils";
nixpkgs.url = "github:NixOS/nixpkgs/nixos-24.05"; nixpkgs.url = "github:nixos/nixpkgs?ref=nixpkgs-unstable";
rust-overlay.url = "github:oxalica/rust-overlay"; rust-overlay.url = "github:oxalica/rust-overlay";
crane = { crane = {
url = "github:ipetkov/crane"; url = "github:ipetkov/crane";
@ -52,9 +52,6 @@
gst_all_1.gstreamer gst_all_1.gstreamer
]; ];
cargoLock = {
lockFile = "./Cargo.lock";
};
cargoArtifacts = craneLib.buildDepsOnly ({ cargoArtifacts = craneLib.buildDepsOnly ({
src = craneLib.cleanCargoSource (craneLib.path ./.); src = craneLib.cleanCargoSource (craneLib.path ./.);
@ -65,7 +62,10 @@
packages = rec { packages = rec {
spot = craneLib.buildPackage { spot = craneLib.buildPackage {
src = craneLib.path ./.; src = craneLib.path ./.;
cargoHash = "";
inherit buildInputs nativeBuildInputs cargoArtifacts; inherit buildInputs nativeBuildInputs cargoArtifacts;
}; };
default = spot; default = spot;