betterlockscreen 3.2.0 -> 4.0.0

This commit is contained in:
Sebastian Sellmeier 2021-08-10 01:01:40 +02:00
parent 3f7771d65c
commit 2f59b54e3f
No known key found for this signature in database
GPG Key ID: 51E2BE0CCC826F98
4 changed files with 34 additions and 26 deletions

View File

@ -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";

View File

@ -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 ];
};
}

View File

@ -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' \

View File

@ -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 { };