colin/nix-files
1
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

rofi: cherry-pick my patches instead of pinning to a fork

Browse Source 
wayland upstream released 1.7.5+wayland3, which is compatible with my patches
This commit is contained in:
Colin
2024-03-10 23:43:34 +00:00
parent 90b9d00f37
commit 0905a658ad
1 changed files with 12 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
hosts/common/programs/rofi/default.nix
View File

@@ -25,23 +25,18 @@
{ pkgs, ... }: { pkgs, ... }:
let let
rofi-unwrapped = pkgs.rofi-wayland-unwrapped.overrideAttrs (upstream: { rofi-unwrapped = pkgs.rofi-wayland-unwrapped.overrideAttrs (upstream: {
# my patches made for tip don't cleanly apply to stable, so advance the entire src patches = (upstream.patches or []) ++ [
src = pkgs.fetchFromGitea { (pkgs.fetchpatch {
domain = "git.uninsane.org"; url = "https://git.uninsane.org/colin/rofi/commit/8e01fcd16f97f4c2a5bc63ade58c894a938f89d9.patch";
owner = "colin"; name = "run-{shell-,}command: expand `{app_id}` inside the template string";
repo = "rofi"; hash = "sha256-DXafvvKrNyDOH11lpRdC2ljydb422ttY68oY5K3fKWo=";
fetchSubmodules = true; })
# rev = "dev-sane"; #< fetchFromGitea doesn't support tags (?) (pkgs.fetchpatch {
rev = "3e7ed93b3a75b964d9c49f1322c9cc886f7d498e"; url = "https://git.uninsane.org/colin/rofi/commit/249450a2b58c3cf7ced911cadb8c4c60d3315dd0.patch";
hash = "sha256-wiQtdvnmju42jmi4UR8PYDL119Gt2DQ/3an4dmeMrjE="; name = "filebrowser: include entries of d_type DT_UNKNOWN";
}; hash = "sha256-gz3N4uo7IWzzqaPHHVhby/e9NbtzcFJRQwgdNYxO/Yw=";
# patches = (upstream.patches or []) ++ [ })
# (pkgs.fetchpatch { ];
# url = "https://git.uninsane.org/colin/rofi/commit/d8bb0b9944ec1f3bf7479c9f127ec09d4198e87f.patch";
# name = "run-{shell-,}command: expand `{app_id}` inside the template string";
# hash = "sha256-XiZRvr+BARU7h3OPU0NUUEem3isnUVER69zucSqvNNk=";
# })
# ];
}); });
# rofi-emoji = pkgs.rofi-emoji.override { # rofi-emoji = pkgs.rofi-emoji.override {
# # plugins must be compiled against the same rofi they're loaded by # # plugins must be compiled against the same rofi they're loaded by