Merge pull request #4577 from khaneliman/cava

fix(nix): bump cava and fix nix build
This commit is contained in:
Alexis Rouillard 2025-10-23 09:35:39 +02:00 committed by GitHub
commit 588c344c8a
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 10 additions and 10 deletions

View File

@ -18,11 +18,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1759036355, "lastModified": 1760878510,
"narHash": "sha256-0m27AKv6ka+q270dw48KflE0LwQYrO7Fm4/2//KCVWg=", "narHash": "sha256-K5Osef2qexezUfs0alLvZ7nQFTGS9DL2oTVsIXsqLgs=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "e9f00bd893984bc8ce46c895c3bf7cac95331127", "rev": "5e2a59a5b1a82f89f2c7e598302a9cacebb72a67",
"type": "github" "type": "github"
}, },
"original": { "original": {

View File

@ -5,17 +5,17 @@
version, version,
}: }:
let let
libcava = rec { libcava = {
version = "0.10.4";
src = pkgs.fetchFromGitHub { src = pkgs.fetchFromGitHub {
owner = "LukashonakV"; owner = "LukashonakV";
repo = "cava"; repo = "cava";
tag = version; # NOTE: Needs to match the cava.wrap
hash = "sha256-9eTDqM+O1tA/3bEfd1apm8LbEcR9CVgELTIspSVPMKM="; rev = "23efcced43b5a395747b18a2e5f2171fc0925d18";
hash = "sha256-CNspaoK5KuME0GfaNijpC24BfALngzNi04/VNwPqMvo=";
}; };
}; };
in in
(waybar.overrideAttrs (oldAttrs: { waybar.overrideAttrs (oldAttrs: {
inherit version; inherit version;
src = lib.cleanSourceWith { src = lib.cleanSourceWith {
@ -39,8 +39,8 @@ in
postUnpack = '' postUnpack = ''
pushd "$sourceRoot" pushd "$sourceRoot"
cp -R --no-preserve=mode,ownership ${libcava.src} subprojects/cava-${libcava.version} cp -R --no-preserve=mode,ownership ${libcava.src} subprojects/cava
patchShebangs . patchShebangs .
popd popd
''; '';
})) })