blankie
/
Waybar
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #2943 from iynaix/master 

nix: update libcava version and removal of gtk-layer-shell meson option
This commit is contained in:
Alexis Rouillard 2024-02-20 11:34:04 +01:00 committed by GitHub
parent a45932973a 00ee538c95
commit 1b4008c58b
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 26 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
nix/default.nix
View File

@ -4,27 +4,32 @@
, version , version
}: }:
let let
catch2_3 = { libcava = rec {
src = pkgs.fetchFromGitHub version = "0.10.1";
{ src = pkgs.fetchFromGitHub {
owner = "catchorg"; owner = "LukashonakV";
repo = "Catch2"; repo = "cava";
rev = "v3.5.1"; rev = version;
hash = "sha256-OyYNUfnu6h1+MfCF8O+awQ4Usad0qrdCtdZhYgOY+Vw="; hash = "sha256-iIYKvpOWafPJB5XhDOSIW9Mb4I3A4pcgIIPQdQYEqUw=";
}; };
}; };
in in
(waybar.overrideAttrs (oldAttrs: rec { (waybar.overrideAttrs (
inherit version; oldAttrs: {
inherit version;
src = lib.cleanSourceWith { src = lib.cleanSourceWith {
filter = name: type: type != "regular" || !lib.hasSuffix ".nix" name; filter = name: type: type != "regular" || !lib.hasSuffix ".nix" name;
src = lib.cleanSource ../.; src = lib.cleanSource ../.;
}; };
})
).override { mesonFlags = lib.remove "-Dgtk-layer-shell=enabled" oldAttrs.mesonFlags;
catch2_3 = pkgs.catch2_3.overrideAttrs (oldAttrs: {
version = "3.5.1"; postUnpack = ''
src = catch2_3.src; pushd "$sourceRoot"
}); cp -R --no-preserve=mode,ownership ${libcava.src} subprojects/cava-${libcava.version}
} patchShebangs .
popd
'';
}
))