From 2f59b54e3f1318c4e0a6079baebf621b9b402880 Mon Sep 17 00:00:00 2001 From: Sebastian Sellmeier Date: Tue, 10 Aug 2021 01:01:40 +0200 Subject: [PATCH] betterlockscreen 3.2.0 -> 4.0.0 --- maintainers/maintainer-list.nix | 6 +++ .../screensavers/betterlockscreen/default.nix | 38 +++++++++++++------ .../betterlockscreen/replace-i3lock.patch | 14 ------- pkgs/top-level/all-packages.nix | 2 +- 4 files changed, 34 insertions(+), 26 deletions(-) delete mode 100644 pkgs/misc/screensavers/betterlockscreen/replace-i3lock.patch diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 4829cdb792d..0096d15941d 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -9668,6 +9668,12 @@ githubId = 1567527; name = "Sebastian Hyberts"; }; + sebtm = { + email = "mail@sebastian-sellmeier.de"; + github = "sebtm"; + githubId = 17243347; + name = "Sebastian Sellmeier"; + }; sellout = { email = "greg@technomadic.org"; github = "sellout"; diff --git a/pkgs/misc/screensavers/betterlockscreen/default.nix b/pkgs/misc/screensavers/betterlockscreen/default.nix index facac2717c4..113c0f5d2e6 100644 --- a/pkgs/misc/screensavers/betterlockscreen/default.nix +++ b/pkgs/misc/screensavers/betterlockscreen/default.nix @@ -1,39 +1,55 @@ -{ - lib, stdenv, makeWrapper, fetchFromGitHub, - imagemagick, i3lock-color, xdpyinfo, xrandr, bc, feh, procps, xrdb +{ fetchFromGitHub +, lib +, makeWrapper +, stdenv + +# Dependencies (@see https://github.com/pavanjadhaw/betterlockscreen/blob/master/shell.nix) +, bc +, coreutils +, i3lock-color +, gawk +, gnugrep +, gnused +, imagemagick +, procps +, xdpyinfo +, xrandr +, xset }: stdenv.mkDerivation rec { pname = "betterlockscreen"; - version = "3.2.0"; + version = "4.0.0"; src = fetchFromGitHub { owner = "pavanjadhaw"; repo = "betterlockscreen"; - rev = version; - sha256 = "sha256-UOMCTHtw1C+MiJL6AQ+8gqmmbqrs1QTzEi1Ar03PyMs="; + rev = "v${version}"; + sha256 = "1ha1yddrcmbsdljdg3gn7i42csbw8h3zgf4i3mcsmbz8nsvc2wdc"; }; nativeBuildInputs = [ makeWrapper ]; - patches = [ ./replace-i3lock.patch ]; - installPhase = let PATH = lib.makeBinPath - [imagemagick i3lock-color xdpyinfo xrandr bc feh procps xrdb]; + [ bc coreutils i3lock-color gawk gnugrep gnused imagemagick procps xdpyinfo xrandr xset ]; in '' + runHook preInstall + mkdir -p $out/bin cp betterlockscreen $out/bin/betterlockscreen wrapProgram "$out/bin/betterlockscreen" --prefix PATH : "$out/bin:${PATH}" + + runHook preInstall ''; meta = with lib; { - description = "A simple minimal lock screen which allows you to cache images with different filters and lockscreen with blazing speed"; + description = "Fast and sweet looking lockscreen for linux systems with effects!"; homepage = "https://github.com/pavanjadhaw/betterlockscreen"; license = licenses.mit; platforms = platforms.linux; - maintainers = with maintainers; [ eyjhb ]; + maintainers = with maintainers; [ eyjhb sebtm ]; }; } diff --git a/pkgs/misc/screensavers/betterlockscreen/replace-i3lock.patch b/pkgs/misc/screensavers/betterlockscreen/replace-i3lock.patch deleted file mode 100644 index 439c3561f96..00000000000 --- a/pkgs/misc/screensavers/betterlockscreen/replace-i3lock.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff --git a/betterlockscreen b/betterlockscreen -index 6dd06e0..746d820 100755 ---- a/betterlockscreen -+++ b/betterlockscreen -@@ -87,7 +87,7 @@ prelock() { - lock() { - #$1 image path - -- i3lock \ -+ i3lock-color \ - -c 00000000 \ - -t -i "$1" \ - --timepos='x+110:h-70' \ - diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index cf4e86402b8..4ce31b67c10 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -25107,7 +25107,7 @@ with pkgs; i3lock-pixeled = callPackage ../misc/screensavers/i3lock-pixeled { }; betterlockscreen = callPackage ../misc/screensavers/betterlockscreen { - inherit (xorg) xrdb; + inherit (xorg) xdpyinfo xrandr xset; }; multilockscreen = callPackage ../misc/screensavers/multilockscreen { };