From 202dd5b24521d5d0e244a3d13e17e9ff45931401 Mon Sep 17 00:00:00 2001
From: SchweGELBin <abramjannikmichael06@gmail.com>
Date: Sat, 6 Sep 2025 16:04:14 +0200
Subject: [PATCH 1/7] rofi: sort packages and inputs

---
 pkgs/applications/misc/rofi/default.nix | 50 ++++++++++++-------------
 1 file changed, 25 insertions(+), 25 deletions(-)

diff --git a/pkgs/applications/misc/rofi/default.nix b/pkgs/applications/misc/rofi/default.nix
index b7e9ea3e707a..d581083e7ac1 100644
--- a/pkgs/applications/misc/rofi/default.nix
+++ b/pkgs/applications/misc/rofi/default.nix
@@ -1,30 +1,30 @@
 {
-  stdenv,
-  lib,
+  bison,
+  buildPackages,
+  cairo,
+  check,
   fetchFromGitHub,
+  flex,
+  git,
+  glib,
+  lib,
+  librsvg,
+  libstartup_notification,
+  libxcb,
+  libxkbcommon,
   meson,
   ninja,
-  pkg-config,
-  libxkbcommon,
+  pandoc,
   pango,
+  pkg-config,
+  stdenv,
   which,
-  git,
-  cairo,
-  libxcb,
   xcb-imdkit,
+  xcbutil,
   xcb-util-cursor,
   xcbutilkeysyms,
-  xcbutil,
   xcbutilwm,
   xcbutilxrm,
-  libstartup_notification,
-  bison,
-  flex,
-  librsvg,
-  check,
-  glib,
-  buildPackages,
-  pandoc,
 }:
 
 stdenv.mkDerivation rec {
@@ -47,33 +47,33 @@ stdenv.mkDerivation rec {
 
   depsBuildBuild = [
     buildPackages.stdenv.cc
-    pkg-config
     glib
+    pkg-config
   ];
   nativeBuildInputs = [
+    bison
+    flex
     meson
     ninja
-    pkg-config
-    flex
-    bison
     pandoc
+    pkg-config
   ];
   buildInputs = [
-    libxkbcommon
-    pango
     cairo
+    check
     git
     librsvg
-    check
     libstartup_notification
     libxcb
+    libxkbcommon
+    pango
+    which
     xcb-imdkit
+    xcbutil
     xcb-util-cursor
     xcbutilkeysyms
-    xcbutil
     xcbutilwm
     xcbutilxrm
-    which
   ];
 
   mesonFlags = [ "-Dimdkit=true" ];

From c9f84d4570e4d493aed2da1249fb30cc79e4fbbd Mon Sep 17 00:00:00 2001
From: SchweGELBin <abramjannikmichael06@gmail.com>
Date: Sat, 6 Sep 2025 16:06:09 +0200
Subject: [PATCH 2/7] rofi: 1.7.9.1 -> 2.0.0

---
 pkgs/applications/misc/rofi/default.nix | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/misc/rofi/default.nix b/pkgs/applications/misc/rofi/default.nix
index d581083e7ac1..6ed9b61a8c9d 100644
--- a/pkgs/applications/misc/rofi/default.nix
+++ b/pkgs/applications/misc/rofi/default.nix
@@ -18,6 +18,9 @@
   pango,
   pkg-config,
   stdenv,
+  wayland,
+  wayland-protocols,
+  wayland-scanner,
   which,
   xcb-imdkit,
   xcbutil,
@@ -29,14 +32,14 @@
 
 stdenv.mkDerivation rec {
   pname = "rofi-unwrapped";
-  version = "1.7.9.1";
+  version = "2.0.0";
 
   src = fetchFromGitHub {
     owner = "davatorium";
     repo = "rofi";
     rev = version;
     fetchSubmodules = true;
-    hash = "sha256-HZMVGlK6ig7kWf/exivoiTe9J/SLgjm7VwRm+KgKN44=";
+    hash = "sha256-akKwIYH9OoCh4ZE/bxKPCppxXsUhplvfRjSGsdthFk4=";
   };
 
   preConfigure = ''
@@ -67,6 +70,9 @@ stdenv.mkDerivation rec {
     libxcb
     libxkbcommon
     pango
+    wayland
+    wayland-protocols
+    wayland-scanner
     which
     xcb-imdkit
     xcbutil

From 578066f23df25523f1c7c33610c76739ddf04c0c Mon Sep 17 00:00:00 2001
From: SchweGELBin <abramjannikmichael06@gmail.com>
Date: Sat, 6 Sep 2025 16:08:18 +0200
Subject: [PATCH 3/7] rofi: add enable options for Wayland and X11 support

---
 pkgs/applications/misc/rofi/default.nix | 19 ++++++++++++++-----
 1 file changed, 14 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/misc/rofi/default.nix b/pkgs/applications/misc/rofi/default.nix
index 6ed9b61a8c9d..d6d0d0f4ecd9 100644
--- a/pkgs/applications/misc/rofi/default.nix
+++ b/pkgs/applications/misc/rofi/default.nix
@@ -1,4 +1,6 @@
 {
+  lib,
+  stdenv,
   bison,
   buildPackages,
   cairo,
@@ -7,7 +9,6 @@
   flex,
   git,
   glib,
-  lib,
   librsvg,
   libstartup_notification,
   libxcb,
@@ -17,7 +18,6 @@
   pandoc,
   pango,
   pkg-config,
-  stdenv,
   wayland,
   wayland-protocols,
   wayland-scanner,
@@ -28,6 +28,8 @@
   xcbutilkeysyms,
   xcbutilwm,
   xcbutilxrm,
+  waylandSupport ? true,
+  x11Support ? true,
 }:
 
 stdenv.mkDerivation rec {
@@ -67,13 +69,17 @@ stdenv.mkDerivation rec {
     git
     librsvg
     libstartup_notification
-    libxcb
     libxkbcommon
     pango
+    which
+  ]
+  ++ lib.optionals waylandSupport [
     wayland
     wayland-protocols
     wayland-scanner
-    which
+  ]
+  ++ lib.optionals x11Support [
+    libxcb
     xcb-imdkit
     xcbutil
     xcb-util-cursor
@@ -82,7 +88,10 @@ stdenv.mkDerivation rec {
     xcbutilxrm
   ];
 
-  mesonFlags = [ "-Dimdkit=true" ];
+  mesonFlags =
+    lib.optionals x11Support [ "-Dimdkit=true" ]
+    ++ lib.optionals (!waylandSupport) [ "-Dwayland=disabled" ]
+    ++ lib.optionals (!x11Support) [ "-Dxcb=disabled" ];
 
   doCheck = false;
 

From 8e403558be2bca5123e520f722aa8deb279d15b8 Mon Sep 17 00:00:00 2001
From: SchweGELBin <abramjannikmichael06@gmail.com>
Date: Sat, 6 Sep 2025 16:09:32 +0200
Subject: [PATCH 4/7] rofi: add SchweGELBin as maintainer

---
 pkgs/applications/misc/rofi/default.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/misc/rofi/default.nix b/pkgs/applications/misc/rofi/default.nix
index d6d0d0f4ecd9..87f74bd6075c 100644
--- a/pkgs/applications/misc/rofi/default.nix
+++ b/pkgs/applications/misc/rofi/default.nix
@@ -99,7 +99,10 @@ stdenv.mkDerivation rec {
     description = "Window switcher, run dialog and dmenu replacement";
     homepage = "https://github.com/davatorium/rofi";
     license = licenses.mit;
-    maintainers = with maintainers; [ bew ];
+    maintainers = with maintainers; [
+      bew
+      SchweGELBin
+    ];
     platforms = with platforms; linux;
     mainProgram = "rofi";
   };

From dd27811d3faa70f6e58f801df0520f2e78821c03 Mon Sep 17 00:00:00 2001
From: SchweGELBin <abramjannikmichael06@gmail.com>
Date: Sat, 6 Sep 2025 16:11:44 +0200
Subject: [PATCH 5/7] rofi-pass: drop rofi-wayland in favor of rofi

---
 pkgs/tools/security/pass/rofi-pass.nix | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/pkgs/tools/security/pass/rofi-pass.nix b/pkgs/tools/security/pass/rofi-pass.nix
index d861d7fde1a9..4e5bdeb34a14 100644
--- a/pkgs/tools/security/pass/rofi-pass.nix
+++ b/pkgs/tools/security/pass/rofi-pass.nix
@@ -12,13 +12,12 @@
   findutils,
   gawk,
   gnused,
+  rofi,
   # wayland-only deps
-  rofi-wayland,
   pass-wayland,
   wl-clipboard,
   wtype,
   # x11-only deps
-  rofi,
   pass,
   xclip,
   xdotool,
@@ -63,16 +62,15 @@ stdenv.mkDerivation {
       gnused
       libnotify
       pwgen
+      rofi
       util-linux
     ]
     ++ lib.optionals (backend == "x11") [
-      rofi
       (pass.withExtensions (ext: [ ext.pass-otp ]))
       xclip
       xdotool
     ]
     ++ lib.optionals (backend == "wayland") [
-      rofi-wayland
       (pass-wayland.withExtensions (ext: [ ext.pass-otp ]))
       wl-clipboard
       wtype

From 188b91103b59ec731f4897c6503ba87da9886d59 Mon Sep 17 00:00:00 2001
From: SchweGELBin <abramjannikmichael06@gmail.com>
Date: Sat, 6 Sep 2025 16:16:16 +0200
Subject: [PATCH 6/7] rofi-wayland: drop in favor of rofi

rofi-wayland has been merged into rofi
https://github.com/davatorium/rofi/releases/tag/2.0.0
---
 doc/release-notes/rl-2511.section.md    |  2 ++
 pkgs/applications/misc/rofi/wayland.nix | 41 -------------------------
 pkgs/top-level/aliases.nix              |  2 ++
 pkgs/top-level/all-packages.nix         |  4 ---
 4 files changed, 4 insertions(+), 45 deletions(-)
 delete mode 100644 pkgs/applications/misc/rofi/wayland.nix

diff --git a/doc/release-notes/rl-2511.section.md b/doc/release-notes/rl-2511.section.md
index 141b887ee05f..1ff48d023daa 100644
--- a/doc/release-notes/rl-2511.section.md
+++ b/doc/release-notes/rl-2511.section.md
@@ -137,6 +137,8 @@
 
 - `pulsemeeter` has been updated to `2.0.0`. The configuration file from older versions has to be deleted. For more information and instructions see the [v2.0.0 changelog entry](https://github.com/theRealCarneiro/pulsemeeter/releases/tag/v2.0.0).
 
+- `rofi` has been updated to `2.0.0`. `rofi-wayland` and `rofi-wayland-unwrapped` have been merged into `rofi` and `rofi-unwrapped` respectively. For more information and instructions see the [v2.0.0 changelog entry](https://github.com/davatorium/rofi/releases/tag/2.0.0).
+
 ## Other Notable Changes {#sec-nixpkgs-release-25.11-notable-changes}
 
 <!-- To avoid merge conflicts, consider adding your item at an arbitrary place in the list instead. -->
diff --git a/pkgs/applications/misc/rofi/wayland.nix b/pkgs/applications/misc/rofi/wayland.nix
deleted file mode 100644
index 25d0a69b7897..000000000000
--- a/pkgs/applications/misc/rofi/wayland.nix
+++ /dev/null
@@ -1,41 +0,0 @@
-{
-  lib,
-  fetchFromGitHub,
-  rofi-unwrapped,
-  wayland-scanner,
-  pkg-config,
-  wayland-protocols,
-  wayland,
-}:
-
-rofi-unwrapped.overrideAttrs (oldAttrs: rec {
-  pname = "rofi-wayland-unwrapped";
-  version = "1.7.9+wayland1";
-
-  src = fetchFromGitHub {
-    owner = "lbonn";
-    repo = "rofi";
-    rev = version;
-    fetchSubmodules = true;
-    hash = "sha256-tLSU0Q221Pg3JYCT+w9ZT4ZbbB5+s8FwsZa/ehfn00s=";
-  };
-
-  depsBuildBuild = oldAttrs.depsBuildBuild ++ [ pkg-config ];
-  nativeBuildInputs = oldAttrs.nativeBuildInputs ++ [
-    wayland-protocols
-    wayland-scanner
-  ];
-  buildInputs = oldAttrs.buildInputs ++ [
-    wayland
-    wayland-protocols
-  ];
-
-  meta = with lib; {
-    description = "Window switcher, run dialog and dmenu replacement for Wayland";
-    homepage = "https://github.com/lbonn/rofi";
-    license = licenses.mit;
-    mainProgram = "rofi";
-    maintainers = with maintainers; [ bew ];
-    platforms = with platforms; linux;
-  };
-})
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index b30c209d5036..b7a58f30efd2 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -2107,6 +2107,8 @@ mapAliases {
   rl_json = tclPackages.rl_json; # Added 2025-05-03
   rockbox_utility = rockbox-utility; # Added 2022-03-17
   rocmPackages_5 = throw "ROCm 5 has been removed in favor of newer versions"; # Added 2025-02-18
+  rofi-wayland = throw "'rofi-wayland' has been merged into 'rofi'"; # Added 2025-09-06
+  rofi-wayland-unwrapped = throw "'rofi-wayland-unwrapped' has been merged into 'rofi-unwrapped'"; # Added 2025-09-06
   root5 = throw "root5 has been removed from nixpkgs because it's a legacy version"; # Added 2025-07-17
   rnix-hashes = throw "'rnix-hashes' has been removed due to lack of upstream maintenance"; # Added 2025-01-25
   rpiboot-unstable = throw "'rpiboot-unstable' has been renamed to/replaced by 'rpiboot'"; # Converted to throw 2024-10-17
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index c1a6a6b1cf8d..826c44d25500 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -12888,10 +12888,6 @@ with pkgs;
 
   rofi-unwrapped = callPackage ../applications/misc/rofi { };
   rofi = callPackage ../applications/misc/rofi/wrapper.nix { };
-  rofi-wayland-unwrapped = callPackage ../applications/misc/rofi/wayland.nix { };
-  rofi-wayland = callPackage ../applications/misc/rofi/wrapper.nix {
-    rofi-unwrapped = rofi-wayland-unwrapped;
-  };
 
   rofi-pass = callPackage ../tools/security/pass/rofi-pass.nix { };
   rofi-pass-wayland = callPackage ../tools/security/pass/rofi-pass.nix {

From 76ff44562435bf36fae035ce0c2bdc1d605b1150 Mon Sep 17 00:00:00 2001
From: SchweGELBin <abramjannikmichael06@gmail.com>
Date: Sat, 6 Sep 2025 16:20:17 +0200
Subject: [PATCH 7/7] rofi-emoji-wayland: drop in favor of rofi-emoji

rofi-wayland has been merged into rofi
https://github.com/davatorium/rofi/releases/tag/2.0.0
---
 doc/release-notes/rl-2511.section.md          | 2 ++
 pkgs/applications/misc/rofi-emoji/default.nix | 2 +-
 pkgs/top-level/aliases.nix                    | 1 +
 pkgs/top-level/all-packages.nix               | 4 ----
 4 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/doc/release-notes/rl-2511.section.md b/doc/release-notes/rl-2511.section.md
index 1ff48d023daa..fc69892b07a6 100644
--- a/doc/release-notes/rl-2511.section.md
+++ b/doc/release-notes/rl-2511.section.md
@@ -139,6 +139,8 @@
 
 - `rofi` has been updated to `2.0.0`. `rofi-wayland` and `rofi-wayland-unwrapped` have been merged into `rofi` and `rofi-unwrapped` respectively. For more information and instructions see the [v2.0.0 changelog entry](https://github.com/davatorium/rofi/releases/tag/2.0.0).
 
+- `rofi-emoji-wayland` has been merged into `rofi-emoji` as `rofi` has been updated to `2.0.0` and supports both X11 & Wayland.
+
 ## Other Notable Changes {#sec-nixpkgs-release-25.11-notable-changes}
 
 <!-- To avoid merge conflicts, consider adding your item at an arbitrary place in the list instead. -->
diff --git a/pkgs/applications/misc/rofi-emoji/default.nix b/pkgs/applications/misc/rofi-emoji/default.nix
index bb7a06377248..520781f67cfc 100644
--- a/pkgs/applications/misc/rofi-emoji/default.nix
+++ b/pkgs/applications/misc/rofi-emoji/default.nix
@@ -80,7 +80,7 @@ import ./versions.nix (
     ++ lib.optionals x11Support [ xclip ];
 
     meta = with lib; {
-      description = "Emoji selector plugin for Rofi (built against ${rofi-unwrapped.pname})";
+      description = "Emoji selector plugin for Rofi";
       homepage = "https://github.com/Mange/rofi-emoji";
       license = licenses.mit;
       maintainers = with maintainers; [
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index b7a58f30efd2..eca7e5835778 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -2107,6 +2107,7 @@ mapAliases {
   rl_json = tclPackages.rl_json; # Added 2025-05-03
   rockbox_utility = rockbox-utility; # Added 2022-03-17
   rocmPackages_5 = throw "ROCm 5 has been removed in favor of newer versions"; # Added 2025-02-18
+  rofi-emoji-wayland = throw "'rofi-emoji-wayland' has been merged into `rofi-emoji as 'rofi-wayland' has been merged into 'rofi'"; # Added 2025-09-06
   rofi-wayland = throw "'rofi-wayland' has been merged into 'rofi'"; # Added 2025-09-06
   rofi-wayland-unwrapped = throw "'rofi-wayland-unwrapped' has been merged into 'rofi-unwrapped'"; # Added 2025-09-06
   root5 = throw "root5 has been removed from nixpkgs because it's a legacy version"; # Added 2025-07-17
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 826c44d25500..6603e7a4ac59 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -12395,10 +12395,6 @@ with pkgs;
   pragha = libsForQt5.callPackage ../applications/audio/pragha { };
 
   rofi-emoji = (callPackage ../applications/misc/rofi-emoji { }).v3;
-  rofi-emoji-wayland =
-    (callPackage ../applications/misc/rofi-emoji {
-      rofi-unwrapped = rofi-wayland-unwrapped;
-    }).v4;
 
   rofi-rbw = python3Packages.callPackage ../applications/misc/rofi-rbw {
     waylandSupport = false;