From 6a65627a05be25ff0091b38d845b32f92a4b83d6 Mon Sep 17 00:00:00 2001 From: John Titor <50095635+JohnRTitor@users.noreply.github.com> Date: Thu, 12 Sep 2024 10:02:44 +0530 Subject: [PATCH 1/2] louvre: 2.2.0-1 -> 2.9.0-1 --- pkgs/by-name/lo/louvre/package.nix | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/pkgs/by-name/lo/louvre/package.nix b/pkgs/by-name/lo/louvre/package.nix index 668e1e2d1a25..28e0c17d2d23 100644 --- a/pkgs/by-name/lo/louvre/package.nix +++ b/pkgs/by-name/lo/louvre/package.nix @@ -22,16 +22,22 @@ }: stdenv.mkDerivation (self: { pname = "louvre"; - version = "2.2.0-1"; - rev = "v${self.version}"; - hash = "sha256-Ds1TTxHFq0Z88djdpAunhtKAipOCTodKIKOh5oxF568="; + version = "2.9.0-1"; src = fetchFromGitHub { - inherit (self) rev hash; owner = "CuarzoSoftware"; repo = "Louvre"; + rev = "v${self.version}"; + hash = "sha256-0M1Hl5kF8r4iFflkGBb9CWqwzauSZPVKSRNWZKFZC4U="; }; + sourceRoot = "${self.src.name}/src"; + + postPatch = '' + substituteInPlace examples/meson.build \ + --replace-fail "/usr/local/share/wayland-sessions" "${placeholder "out"}/share/wayland-sessions" + ''; + nativeBuildInputs = [ meson ninja @@ -58,11 +64,6 @@ stdenv.mkDerivation (self: { outputs = [ "out" "dev" ]; - preConfigure = '' - # The root meson.build file is in src/ - cd src - ''; - meta = { description = "C++ library for building Wayland compositors"; homepage = "https://github.com/CuarzoSoftware/Louvre"; From dce85e24f87730c6400486bd5c78f435634e04e9 Mon Sep 17 00:00:00 2001 From: John Titor <50095635+JohnRTitor@users.noreply.github.com> Date: Thu, 12 Sep 2024 10:04:46 +0530 Subject: [PATCH 2/2] louvre: add update script cleanup --- pkgs/by-name/lo/louvre/package.nix | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/lo/louvre/package.nix b/pkgs/by-name/lo/louvre/package.nix index 28e0c17d2d23..1852a7dc3990 100644 --- a/pkgs/by-name/lo/louvre/package.nix +++ b/pkgs/by-name/lo/louvre/package.nix @@ -19,19 +19,20 @@ , udev , wayland , xorgproto +, nix-update-script }: -stdenv.mkDerivation (self: { +stdenv.mkDerivation (finalAttrs: { pname = "louvre"; version = "2.9.0-1"; src = fetchFromGitHub { owner = "CuarzoSoftware"; repo = "Louvre"; - rev = "v${self.version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-0M1Hl5kF8r4iFflkGBb9CWqwzauSZPVKSRNWZKFZC4U="; }; - sourceRoot = "${self.src.name}/src"; + sourceRoot = "${finalAttrs.src.name}/src"; postPatch = '' substituteInPlace examples/meson.build \ @@ -64,6 +65,10 @@ stdenv.mkDerivation (self: { outputs = [ "out" "dev" ]; + passthru = { + updateScript = nix-update-script { }; + }; + meta = { description = "C++ library for building Wayland compositors"; homepage = "https://github.com/CuarzoSoftware/Louvre";