diff options
| author | Alyssa Ross <hi@alyssa.is> | 2021-06-22 15:01:47 +0000 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2021-06-22 16:57:59 +0000 |
| commit | 633cab0ecb07627706c6b523e219490f019eaab5 (patch) | |
| tree | 4fb472bdfe2723037dad53dc1b8a87c939015f5e /nixpkgs/pkgs/misc/screensavers/betterlockscreen | |
| parent | ffb691c199e7e0cbc4e45e5310779c9e3f7c2a73 (diff) | |
| parent | 432fc2d9a67f92e05438dff5fdc2b39d33f77997 (diff) | |
| download | nixlib-633cab0ecb07627706c6b523e219490f019eaab5.tar nixlib-633cab0ecb07627706c6b523e219490f019eaab5.tar.gz nixlib-633cab0ecb07627706c6b523e219490f019eaab5.tar.bz2 nixlib-633cab0ecb07627706c6b523e219490f019eaab5.tar.lz nixlib-633cab0ecb07627706c6b523e219490f019eaab5.tar.xz nixlib-633cab0ecb07627706c6b523e219490f019eaab5.tar.zst nixlib-633cab0ecb07627706c6b523e219490f019eaab5.zip | |
Merge commit '432fc2d9a67f92e05438dff5fdc2b39d33f77997'
# Conflicts: # nixpkgs/pkgs/applications/editors/emacs/elisp-packages/elpa-generated.nix # nixpkgs/pkgs/applications/networking/mailreaders/thunderbird/default.nix # nixpkgs/pkgs/applications/window-managers/sway/default.nix # nixpkgs/pkgs/build-support/rust/default.nix # nixpkgs/pkgs/development/go-modules/generic/default.nix
Diffstat (limited to 'nixpkgs/pkgs/misc/screensavers/betterlockscreen')
| -rw-r--r-- | nixpkgs/pkgs/misc/screensavers/betterlockscreen/default.nix | 4 | ||||
| -rw-r--r-- | nixpkgs/pkgs/misc/screensavers/betterlockscreen/replace-i3lock.patch | 6 |
2 files changed, 6 insertions, 4 deletions
diff --git a/nixpkgs/pkgs/misc/screensavers/betterlockscreen/default.nix b/nixpkgs/pkgs/misc/screensavers/betterlockscreen/default.nix index 8d40df14616e..facac2717c4c 100644 --- a/nixpkgs/pkgs/misc/screensavers/betterlockscreen/default.nix +++ b/nixpkgs/pkgs/misc/screensavers/betterlockscreen/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { pname = "betterlockscreen"; - version = "3.0.1"; + version = "3.2.0"; src = fetchFromGitHub { owner = "pavanjadhaw"; repo = "betterlockscreen"; rev = version; - sha256 = "0jc8ifb69shmd0avx6vny4m1w5dfxkkf5vnm7qcrmc8yflb0s3z6"; + sha256 = "sha256-UOMCTHtw1C+MiJL6AQ+8gqmmbqrs1QTzEi1Ar03PyMs="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/nixpkgs/pkgs/misc/screensavers/betterlockscreen/replace-i3lock.patch b/nixpkgs/pkgs/misc/screensavers/betterlockscreen/replace-i3lock.patch index 3bbbfcfd613d..439c3561f960 100644 --- a/nixpkgs/pkgs/misc/screensavers/betterlockscreen/replace-i3lock.patch +++ b/nixpkgs/pkgs/misc/screensavers/betterlockscreen/replace-i3lock.patch @@ -1,12 +1,14 @@ +diff --git a/betterlockscreen b/betterlockscreen +index 6dd06e0..746d820 100755 --- a/betterlockscreen +++ b/betterlockscreen -@@ -76,7 +76,7 @@ prelock() { +@@ -87,7 +87,7 @@ prelock() { lock() { #$1 image path - i3lock \ + i3lock-color \ + -c 00000000 \ -t -i "$1" \ --timepos='x+110:h-70' \ - --datepos='x+43:h-45' \ |