Merge pull request #329531 from Mange/rofi-emoji-split

rofi-emoji: 3.4.0 -> 3.4.1 + 4.0.0 / rofi-emoji-wayland

maintainers/maintainer-list.nix

@@ -12400,6 +12400,13 @@
     githubId = 115060;
     name = "Marek Maksimczyk";
   };
+  Mange = {
+    name = "Magnus Bergmark";
+    email = "me@mange.dev";
+    github = "Mange";
+    githubId = 1599;
+    keys = [ { fingerprint = "2EA6 F4AA 110A 1BF2 2275  19A9 0443 C69F 6F02 2CDE"; } ];
+  };
   mangoiv = {
     email = "contact@mangoiv.com";
     github = "mangoiv";

pkgs/applications/misc/rofi-emoji/default.nix

@@ -15,26 +15,23 @@
 , rofi-unwrapped
 , wl-clipboard
 , xclip
-, xsel
 , xdotool
 , wtype
 }:
 
+import ./versions.nix ({ version, hash, patches}:
   stdenv.mkDerivation rec {
     pname = "rofi-emoji";
-  version = "3.4.0";
+    inherit version;
 
     src = fetchFromGitHub {
       owner = "Mange";
-    repo = pname;
+      repo = "rofi-emoji";
       rev = "v${version}";
-    hash = "sha256-tF3yAKRUix+if+45rxg5vq83Pu33TQ6oUKWPIs/l4X0=";
+      inherit hash;
     };
 
-  patches = [
+    inherit patches;
-    # Look for plugin-related files in $out/lib/rofi
-    ./0001-Patch-plugindir-to-output.patch
-  ];
 
     postPatch = ''
       patchShebangs clipboard-adapter.sh
@@ -43,9 +40,9 @@ stdenv.mkDerivation rec {
     postFixup = ''
       chmod +x $out/share/rofi-emoji/clipboard-adapter.sh
       wrapProgram $out/share/rofi-emoji/clipboard-adapter.sh \
-     --prefix PATH ":" ${lib.makeBinPath ([ libnotify wl-clipboard xclip xsel ]
+       --prefix PATH ":" ${lib.makeBinPath ([ libnotify ]
-       ++ lib.optionals waylandSupport [ wtype ]
+         ++ lib.optionals waylandSupport [ wl-clipboard wtype ]
-       ++ lib.optionals x11Support [ xdotool ])}
+         ++ lib.optionals x11Support [ xclip xdotool ])}
     '';
 
 
@@ -60,16 +57,16 @@ stdenv.mkDerivation rec {
       glib
       libnotify
       rofi-unwrapped
-    wl-clipboard
+    ]
-    xclip
+      ++ lib.optionals waylandSupport [ wl-clipboard wtype ]
-    xsel
+      ++ lib.optionals x11Support [ xclip ];
-  ];
 
     meta = with lib; {
-    description = "Emoji selector plugin for Rofi";
+      description = "Emoji selector plugin for Rofi (built against ${rofi-unwrapped.pname})";
       homepage = "https://github.com/Mange/rofi-emoji";
       license = licenses.mit;
-    maintainers = with maintainers; [ cole-h ];
+      maintainers = with maintainers; [ cole-h Mange ];
       platforms = platforms.linux;
     };
   }
+)

pkgs/applications/misc/rofi-emoji/versions.nix

@@ -0,0 +1,18 @@
+generic: {
+  v4 = generic {
+    version = "4.0.0";
+    hash = "sha256-864Mohxfc3EchBKtSNifxy8g8T8YBUQ/H7+8Ti6TiFo=";
+    patches = [
+      # Look for plugin-related files in $out/lib/rofi
+      ./0001-Patch-plugindir-to-output.patch
+    ];
+  };
+  v3 = generic {
+    version = "3.4.1";
+    hash = "sha256-ZHhgYytPB14zj2MS8kChRD+LTqXzHRrz7YIikuQD6i0=";
+    patches = [
+      # Look for plugin-related files in $out/lib/rofi
+      ./0001-Patch-plugindir-to-output.patch
+    ];
+  };
+}

pkgs/top-level/all-packages.nix

@@ -32292,7 +32292,12 @@ with pkgs;
 
   rofi-calc = callPackage ../applications/science/math/rofi-calc { };
 
-  rofi-emoji = callPackage ../applications/misc/rofi-emoji { };
+  rofi-emoji = (callPackage ../applications/misc/rofi-emoji { }).v3;
+  rofi-emoji-wayland = (
+    callPackage ../applications/misc/rofi-emoji {
+      rofi-unwrapped = rofi-wayland-unwrapped;
+    }
+  ).v4;
 
   rofi-file-browser = callPackage ../applications/misc/rofi-file-browser { };