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

nix: update libcava version and removal of gtk-layer-shell meson option

pull/2943/head
Lin Xianyi 2024-02-20 17:51:42 +08:00
parent e42635197c
commit 00ee538c95
1 changed files with 26 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
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 (
oldAttrs: {
inherit version; 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
'';
}
))