diff --git a/pkgs/applications/misc/rofi/config.patch b/pkgs/applications/misc/rofi/config.patch
index c42c647e697..46982d51e00 100644
--- a/pkgs/applications/misc/rofi/config.patch
+++ b/pkgs/applications/misc/rofi/config.patch
@@ -1,8 +1,44 @@
diff --git a/script/rofi-theme-selector b/script/rofi-theme-selector
-index 0646e4bc..a19ec706 100755
+index 0646e4bc..f827dbfe 100755
--- a/script/rofi-theme-selector
+++ b/script/rofi-theme-selector
-@@ -164,7 +164,12 @@ Current theme: ${CUR}"""
+@@ -42,34 +42,7 @@ function find_themes()
+ DIRS=${XDG_DATA_DIRS}
+ OLDIFS=${IFS}
+ IFS=:
+- if [ -z "${XDG_DATA_DIRS}" ]
+- then
+- echo "XDG_DATA_DIRS needs to be set for this script to function correctly."
+- echo -n "Using dirs from \$PATH: "
+- DIRS=
+- # Iterate over items in $PATH
+- for p in ${PATH}; do
+- # Remove trailing / if exists.
+- x=${p%/}
+- # remove both /bin and /sbin and /games from end
+- x=${x%/bin}
+- x=${x%/sbin}
+- x=${x%/games}
+- # Add /share
+- x=${x}/share
+- # Check if entry exists Prepend : so :${x}: matches nicely
+- case ":${DIRS}" in
+- *$x:*);;
+- *) DIRS+="$x:";;
+- esac
+- done
+- # Remove trailing :
+- DIRS=${DIRS%:}
+- echo "${DIRS}"
+- fi
+- # Add user dir.
+- DIRS+=":${HOME}/.local/share/"
+- DIRS+=":${HOME}/.config/"
++ DIRS+=":%ROFIOUT%/"
+ for p in ${DIRS}; do
+ p=${p%/}
+ TD=${p}/rofi/themes
+@@ -164,7 +137,12 @@ Current theme: ${CUR}"""
###
function set_theme()
{
diff --git a/pkgs/applications/misc/rofi/default.nix b/pkgs/applications/misc/rofi/default.nix
index 707cdd42206..734adf3eb58 100644
--- a/pkgs/applications/misc/rofi/default.nix
+++ b/pkgs/applications/misc/rofi/default.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
};
# config.patch may be removed in the future - https://github.com/DaveDavenport/rofi/pull/781
- patches = [ ./nix.patch ./config.patch ];
+ patches = [ ./config.patch ];
preConfigure = ''
patchShebangs "script"
diff --git a/pkgs/applications/misc/rofi/nix.patch b/pkgs/applications/misc/rofi/nix.patch
deleted file mode 100644
index 2e91f81b0f2..00000000000
--- a/pkgs/applications/misc/rofi/nix.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-diff --git a/script/rofi-theme-selector b/script/rofi-theme-selector
-index 0646e4bc..f82e5ad9 100755
---- a/script/rofi-theme-selector
-+++ b/script/rofi-theme-selector
-@@ -42,34 +42,8 @@ function find_themes()
- DIRS=${XDG_DATA_DIRS}
- OLDIFS=${IFS}
- IFS=:
-- if [ -z "${XDG_DATA_DIRS}" ]
-- then
-- echo "XDG_DATA_DIRS needs to be set for this script to function correctly."
-- echo -n "Using dirs from \$PATH: "
-- DIRS=
-- # Iterate over items in $PATH
-- for p in ${PATH}; do
-- # Remove trailing / if exists.
-- x=${p%/}
-- # remove both /bin and /sbin and /games from end
-- x=${x%/bin}
-- x=${x%/sbin}
-- x=${x%/games}
-- # Add /share
-- x=${x}/share
-- # Check if entry exists Prepend : so :${x}: matches nicely
-- case ":${DIRS}" in
-- *$x:*);;
-- *) DIRS+="$x:";;
-- esac
-- done
-- # Remove trailing :
-- DIRS=${DIRS%:}
-- echo "${DIRS}"
-- fi
-- # Add user dir.
-- DIRS+=":${HOME}/.local/share/"
-- DIRS+=":${HOME}/.config/"
-+
-+ DIRS+=":%ROFIOUT%/"
- for p in ${DIRS}; do
- p=${p%/}
- TD=${p}/rofi/themes