diff options
| author | Robert Schütz <dev@schuetz-co.de> | 2021-03-14 19:41:58 +0100 |
|---|---|---|
| committer | Robert Schütz <dev@schuetz-co.de> | 2021-03-14 20:03:20 +0100 |
| commit | 40e2f9fb032a517839c1f0b774155c8917da00d6 (patch) | |
| tree | b09c40388012e8aca7fd03954c3fb1ad71683040 /pkgs/tools/misc/ytfzf | |
| parent | 916ee862e87ac5ee2439f2fb7856386b4dc906ae (diff) | |
ytfzf: 1.0.1 -> 1.1.0
Prevent ytfzf from installing its own updates. Add all programs that are possibly used in the script to $PATH. A 10M increase in closure size seems very acceptable.
Diffstat (limited to 'pkgs/tools/misc/ytfzf')
| -rw-r--r-- | pkgs/tools/misc/ytfzf/default.nix | 15 | ||||
| -rw-r--r-- | pkgs/tools/misc/ytfzf/no-update.patch | 30 |
2 files changed, 42 insertions, 3 deletions
diff --git a/pkgs/tools/misc/ytfzf/default.nix b/pkgs/tools/misc/ytfzf/default.nix index 9feecb589126d..56e139941b2a6 100644 --- a/pkgs/tools/misc/ytfzf/default.nix +++ b/pkgs/tools/misc/ytfzf/default.nix @@ -2,25 +2,34 @@ , stdenv , fetchFromGitHub , makeWrapper +, coreutils , curl , dmenu , fzf +, gnused , jq , mpv +, ncurses +, ueberzug , youtube-dl }: stdenv.mkDerivation rec { pname = "ytfzf"; - version = "1.0.1"; + version = "1.1.0"; src = fetchFromGitHub { owner = "pystardust"; repo = "ytfzf"; rev = "v${version}"; - sha256 = "1i9ya38zcaj1vkfgy1n4gp5vqb59zlrd609pdmz4jqinrb0c5fgv"; + sha256 = "sha256-ATQRXYaIp1MKCO/EAPsopzFEZeNJzdk73/OcgjsMdkg="; }; + patches = [ + # Updates have to be installed through Nix. + ./no-update.patch + ]; + nativeBuildInputs = [ makeWrapper ]; makeFlags = [ "PREFIX=${placeholder "out"}/bin" ]; @@ -29,7 +38,7 @@ stdenv.mkDerivation rec { postInstall = '' wrapProgram "$out/bin/ytfzf" --prefix PATH : ${lib.makeBinPath [ - curl dmenu fzf jq mpv youtube-dl + coreutils curl dmenu fzf gnused jq mpv ncurses ueberzug youtube-dl ]} ''; diff --git a/pkgs/tools/misc/ytfzf/no-update.patch b/pkgs/tools/misc/ytfzf/no-update.patch new file mode 100644 index 0000000000000..07ca62cd94340 --- /dev/null +++ b/pkgs/tools/misc/ytfzf/no-update.patch @@ -0,0 +1,30 @@ +diff --git a/ytfzf b/ytfzf +index 5238682..c5c3a1a 100755 +--- a/ytfzf ++++ b/ytfzf +@@ -757,23 +757,8 @@ clear_history () { + } + + update_ytfzf () { +- branch="$1" +- updatefile="/tmp/ytfzf-update" +- curl -L "https://raw.githubusercontent.com/pystardust/ytfzf/$branch/ytfzf" -o "$updatefile" +- +- if sed -n '1p' < "$updatefile" | grep -q '#!/bin/sh' ; then +- chmod 755 "$updatefile" +- if [ "$(uname)" = "Darwin" ]; then +- sudo cp "$updatefile" "/usr/local/bin/ytfzf" +- else +- sudo cp "$updatefile" "/usr/bin/ytfzf" +- fi +- else +- printf "%bFailed to update ytfzf. Try again later.%b" "$c_red" "$c_reset" +- fi +- +- rm "$updatefile" +- exit ++ printf "%bUpdates have to be installed through Nix.%b\n" "$c_red" "$c_reset" ++ exit 1 + } + + |