diff options
Diffstat (limited to 'pkgs/by-name/hy')
-rw-r--r-- | pkgs/by-name/hy/hyprland-workspaces/package.nix | 6 | ||||
-rw-r--r-- | pkgs/by-name/hy/hyprlock/cmake.patch | 15 | ||||
-rw-r--r-- | pkgs/by-name/hy/hyprlock/package.nix | 58 |
3 files changed, 35 insertions, 44 deletions
diff --git a/pkgs/by-name/hy/hyprland-workspaces/package.nix b/pkgs/by-name/hy/hyprland-workspaces/package.nix index 4ca89b0da1188..11307059e6806 100644 --- a/pkgs/by-name/hy/hyprland-workspaces/package.nix +++ b/pkgs/by-name/hy/hyprland-workspaces/package.nix @@ -6,16 +6,16 @@ rustPlatform.buildRustPackage rec { pname = "hyprland-workspaces"; - version = "2.0.0"; + version = "2.0.1"; src = fetchFromGitHub { owner = "FieldofClay"; repo = "hyprland-workspaces"; rev = "v${version}"; - hash = "sha256-4QGLTimIpx74gWUyHCheUZZT1WgVzBoJRY8OlUDdOh4="; + hash = "sha256-GhUjvFMlgjTdgtV9ASW7IqE2dBktPyOlRwg6qM1r7vc="; }; - cargoHash = "sha256-9ndP0nyRBCdOGth4UWA263IvjbgnVW2x9PK8oTaMrxg="; + cargoHash = "sha256-RZVQSkegX8Fa9SNY7tGNxyu312oeDjXK4U1+1/UIAyA="; meta = with lib; { description = "A multi-monitor aware Hyprland workspace widget"; diff --git a/pkgs/by-name/hy/hyprlock/cmake.patch b/pkgs/by-name/hy/hyprlock/cmake.patch deleted file mode 100644 index 92c21d643c0f3..0000000000000 --- a/pkgs/by-name/hy/hyprlock/cmake.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 07e2338..720810b 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -83,9 +83,4 @@ protocol("unstable/linux-dmabuf/linux-dmabuf-unstable-v1.xml" "linux-dmabuf-unst - # Installation - install(TARGETS hyprlock) - --install(CODE " -- if (NOT EXISTS \"${CMAKE_INSTALL_FULL_SYSCONFDIR}/pam.d/hyprlock\") -- install(FILES \"${CMAKE_SOURCE_DIR}/pam/hyprlock\" DESTINATION \"${CMAKE_INSTALL_FULL_SYSCONFDIR}/pam.d\") -- endif() --") -- -+install(FILES "${CMAKE_SOURCE_DIR}/pam/hyprlock" DESTINATION "${CMAKE_INSTALL_FULL_SYSCONFDIR}/pam.d") diff --git a/pkgs/by-name/hy/hyprlock/package.nix b/pkgs/by-name/hy/hyprlock/package.nix index fb59a96321a09..722e90b445ea3 100644 --- a/pkgs/by-name/hy/hyprlock/package.nix +++ b/pkgs/by-name/hy/hyprlock/package.nix @@ -1,37 +1,37 @@ -{ lib -, stdenv -, fetchFromGitHub -, cmake -, pkg-config -, libGL -, libxkbcommon -, hyprlang -, pam -, wayland -, wayland-protocols -, cairo -, pango -, libdrm -, mesa -, nix-update-script +{ + lib, + stdenv, + fetchFromGitHub, + cmake, + pkg-config, + libGL, + libxkbcommon, + hyprlang, + pam, + wayland, + wayland-protocols, + cairo, + file, + libjpeg, + libwebp, + pango, + libdrm, + mesa, + nix-update-script, }: stdenv.mkDerivation (finalAttrs: { pname = "hyprlock"; - version = "0.3.0"; + version = "0.3.0-unstable-2024-04-24"; src = fetchFromGitHub { owner = "hyprwm"; repo = "hyprlock"; - rev = "v${finalAttrs.version}"; - hash = "sha256-rbzVe2WNdHynJrnyJsKOOrV8yuuJ7QIuah3ZHWERSnA="; + # FIXME: Change to a stable release once available + rev = "415262065fff0a04b229cd00165f346a86a0a73a"; + hash = "sha256-jla5Wo0Qt3NEnD0OjNj85BGw0pR4Zlz5uy8AqHH7tuE="; }; - patches = [ - # remove PAM file install check - ./cmake.patch - ]; - strictDeps = true; nativeBuildInputs = [ @@ -41,9 +41,12 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ cairo + file hyprlang libdrm libGL + libjpeg + libwebp libxkbcommon mesa pam @@ -58,8 +61,11 @@ stdenv.mkDerivation (finalAttrs: { description = "Hyprland's GPU-accelerated screen locking utility"; homepage = "https://github.com/hyprwm/hyprlock"; license = lib.licenses.bsd3; - maintainers = with lib.maintainers; [ eclairevoyant ]; + maintainers = with lib.maintainers; [ ]; mainProgram = "hyprlock"; - platforms = [ "aarch64-linux" "x86_64-linux" ]; + platforms = [ + "aarch64-linux" + "x86_64-linux" + ]; }; }) |