diff options
author | Janik <80165193+Janik-Haag@users.noreply.github.com> | 2023-11-24 08:08:01 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-11-24 08:08:01 +0100 |
commit | babbc70adb1a72b43c14e3fbf74ecccfce5f1b1d (patch) | |
tree | f49b1bd523d7aac85b800d3f039ce7ad9cc9df81 /pkgs/applications/window-managers | |
parent | df34a82563c6c4ccb8a92a624ce95882b3ca6f48 (diff) | |
parent | 8a66f36bc598f7d87fed153ff1da017a8a84ef79 (diff) |
Merge pull request #268845 from frogamic/swaylock-fancy
Diffstat (limited to 'pkgs/applications/window-managers')
-rw-r--r-- | pkgs/applications/window-managers/sway/lock-fancy.nix | 36 |
1 files changed, 26 insertions, 10 deletions
diff --git a/pkgs/applications/window-managers/sway/lock-fancy.nix b/pkgs/applications/window-managers/sway/lock-fancy.nix index 2eb817b9b1f8d..83d56def4dcce 100644 --- a/pkgs/applications/window-managers/sway/lock-fancy.nix +++ b/pkgs/applications/window-managers/sway/lock-fancy.nix @@ -1,5 +1,17 @@ -{ lib, stdenv, fetchFromGitHub, coreutils, grim, gawk, jq, swaylock -, imagemagick, getopt, fontconfig, wmctrl, makeWrapper, bash +{ lib +, stdenv +, fetchFromGitHub +, coreutils +, grim +, gawk +, jq +, swaylock +, imagemagick +, getopt +, fontconfig +, wmctrl +, makeWrapper +, bash }: let @@ -14,19 +26,22 @@ let fontconfig wmctrl ]; -in stdenv.mkDerivation rec { - pname = "swaylock-fancy-unstable"; - version = "2021-10-11"; + mainProgram = "swaylock-fancy"; +in + +stdenv.mkDerivation { + pname = "swaylock-fancy"; + version = "unstable-2023-11-21"; src = fetchFromGitHub { owner = "Big-B"; repo = "swaylock-fancy"; - rev = "265fbfb438392339bf676b0a9dbe294abe2a699e"; - sha256 = "NjxeJyWYXBb1P8sXKgb2EWjF+cNodTE83r1YwRYoBjM="; + rev = "ff37ae3c6d0f100f81ff64fdb9d422c37de2f4f6"; + hash = "sha256-oS4YCbZOIrMP4QSM5eHWzTn18k3w2OnJ2k+64x/DnuM="; }; postPatch = '' - substituteInPlace swaylock-fancy \ + substituteInPlace ${mainProgram} \ --replace "/usr/share" "$out/share" ''; @@ -37,7 +52,7 @@ in stdenv.mkDerivation rec { makeFlags = [ "PREFIX=${placeholder "out"}" ]; postInstall = '' - wrapProgram $out/bin/swaylock-fancy \ + wrapProgram $out/bin/${mainProgram} \ --prefix PATH : "${depsPath}" ''; @@ -46,6 +61,7 @@ in stdenv.mkDerivation rec { homepage = "https://github.com/Big-B/swaylock-fancy"; license = licenses.mit; platforms = platforms.linux; - maintainers = with maintainers; [ ]; + maintainers = with maintainers; [ frogamic ]; + inherit mainProgram; }; } |