From 68ed9da5e3ef13bf80fa22ff99dcb1d39bcf72dc Mon Sep 17 00:00:00 2001 From: Lin Xianyi Date: Wed, 10 Apr 2024 21:48:22 +0800 Subject: [PATCH] hyprlock: 0.2.0 -> 0.3.0 --- pkgs/by-name/hy/hyprlock/cmake.patch | 15 +++++++++++++++ pkgs/by-name/hy/hyprlock/package.nix | 9 +++++++-- 2 files changed, 22 insertions(+), 2 deletions(-) create mode 100644 pkgs/by-name/hy/hyprlock/cmake.patch diff --git a/pkgs/by-name/hy/hyprlock/cmake.patch b/pkgs/by-name/hy/hyprlock/cmake.patch new file mode 100644 index 000000000000..92c21d643c0f --- /dev/null +++ b/pkgs/by-name/hy/hyprlock/cmake.patch @@ -0,0 +1,15 @@ +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 5bac39c63d49..fb59a96321a0 100644 --- a/pkgs/by-name/hy/hyprlock/package.nix +++ b/pkgs/by-name/hy/hyprlock/package.nix @@ -18,15 +18,20 @@ stdenv.mkDerivation (finalAttrs: { pname = "hyprlock"; - version = "0.2.0"; + version = "0.3.0"; src = fetchFromGitHub { owner = "hyprwm"; repo = "hyprlock"; rev = "v${finalAttrs.version}"; - hash = "sha256-1p6Y/8+ETaz7GQ8wsXLUTrk2dD0YN9ySOfwjRp2TSG4="; + hash = "sha256-rbzVe2WNdHynJrnyJsKOOrV8yuuJ7QIuah3ZHWERSnA="; }; + patches = [ + # remove PAM file install check + ./cmake.patch + ]; + strictDeps = true; nativeBuildInputs = [