rofi: 1.5.1 -> 1.5.2
https://github.com/DaveDavenport/rofi/releases/tag/1.5.2
This commit is contained in:
parent
46e7ce0526
commit
e0d8f387d9
@ -1,54 +0,0 @@
|
||||
diff --git a/script/rofi-theme-selector b/script/rofi-theme-selector
|
||||
index 0646e4bc..f827dbfe 100755
|
||||
--- a/script/rofi-theme-selector
|
||||
+++ b/script/rofi-theme-selector
|
||||
@@ -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: <b>${CUR}</b>"""
|
||||
###
|
||||
function set_theme()
|
||||
{
|
||||
- CDIR="${HOME}/.config/rofi/"
|
||||
+ if [ -d "${XDG_CONFIG_HOME}" ]; then
|
||||
+ CDIR="${XDG_CONFIG_HOME}/rofi/"
|
||||
+ else
|
||||
+ CDIR="${HOME}/.config/rofi/"
|
||||
+ fi
|
||||
+
|
||||
if [ ! -d "${CDIR}" ]
|
||||
then
|
||||
mkdir -p ${CDIR}
|
@ -4,28 +4,20 @@
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "1.5.1";
|
||||
version = "1.5.2";
|
||||
name = "rofi-unwrapped-${version}";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/DaveDavenport/rofi/releases/download/${version}/rofi-${version}.tar.gz";
|
||||
sha256 = "1dc33zf33z38jcxb0lxpyd31waalpf6d4cd9z5f9m5qphdk1g679";
|
||||
sha256 = "1rczxz6l32vnclarzga1sm1d5iq9rfscb9j7f8ih185n59hf0517";
|
||||
};
|
||||
|
||||
# config.patch may be removed in the future - https://github.com/DaveDavenport/rofi/pull/781
|
||||
patches = [ ./config.patch ];
|
||||
|
||||
preConfigure = ''
|
||||
patchShebangs "script"
|
||||
# root not present in build /etc/passwd
|
||||
sed -i 's/~root/~nobody/g' test/helper-expand.c
|
||||
'';
|
||||
|
||||
postFixup = ''
|
||||
substituteInPlace "$out"/bin/rofi-theme-selector \
|
||||
--replace "%ROFIOUT%" "$out/share"
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [ autoreconfHook pkgconfig ];
|
||||
buildInputs = [ libxkbcommon pango cairo git bison flex librsvg check
|
||||
libstartup_notification libxcb xcbutil xcbutilwm xcbutilxrm which
|
||||
|
Loading…
Reference in New Issue
Block a user