diff --git a/pkgs/by-name/mi/miriway/package.nix b/pkgs/by-name/mi/miriway/package.nix index 9ae59bf05347..fe41c1b313b2 100644 --- a/pkgs/by-name/mi/miriway/package.nix +++ b/pkgs/by-name/mi/miriway/package.nix @@ -4,35 +4,55 @@ fetchFromGitHub, gitUpdater, nixosTests, + bash, cmake, + inotify-tools, pkg-config, mir, libxkbcommon, + swaybg, }: stdenv.mkDerivation (finalAttrs: { pname = "miriway"; - version = "24.09"; + version = "24.10.1"; src = fetchFromGitHub { owner = "Miriway"; repo = "Miriway"; rev = "refs/tags/v${finalAttrs.version}"; - hash = "sha256-/0txc9ynC3rj9tbHwYNlDe2C1DlmjoE2Q2/uoBz2GFg="; + hash = "sha256-jpXsvr2HnfMCJh851oS+IiQLSmL9C1bnaG6IPSq5xrA="; }; + postPatch = '' + substituteInPlace CMakeLists.txt \ + --replace-fail 'DESTINATION /usr/lib/systemd' 'DESTINATION ''${CMAKE_INSTALL_LIBDIR}/systemd' + ''; + strictDeps = true; + # Source has a path "systemd/usr/{libexec,lib}/...", don't break references to that + dontFixCmake = true; + nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ + bash mir libxkbcommon ]; + postInstall = '' + substituteInPlace $out/bin/miriway-background \ + --replace-fail 'exec swaybg' 'exec ${lib.getExe swaybg}' + + substituteInPlace $out/bin/miriway-run \ + --replace-fail 'inotifywait -qq' '${lib.getExe' inotify-tools "inotifywait"} -qq' + ''; + passthru = { updateScript = gitUpdater { rev-prefix = "v"; }; providedSessions = [ "miriway" ];