From a4da81bfacf61703a178c37d70a4dbabf81db3d5 Mon Sep 17 00:00:00 2001 From: zi3m5f <113244000+zi3m5f@users.noreply.github.com> Date: Mon, 28 Oct 2024 22:30:34 +0100 Subject: [PATCH 1/2] libsfdo: init at 0.1.3 --- pkgs/by-name/li/libsfdo/package.nix | 51 +++++++++++++++++++++++++++++ 1 file changed, 51 insertions(+) create mode 100644 pkgs/by-name/li/libsfdo/package.nix diff --git a/pkgs/by-name/li/libsfdo/package.nix b/pkgs/by-name/li/libsfdo/package.nix new file mode 100644 index 000000000000..2095b8a4efce --- /dev/null +++ b/pkgs/by-name/li/libsfdo/package.nix @@ -0,0 +1,51 @@ +{ + lib, + stdenv, + fetchFromGitLab, + meson, + ninja, + pkg-config, + testers, + validatePkgConfig, +}: +stdenv.mkDerivation (finalAttrs: { + pname = "libsfdo"; + version = "0.1.3"; + + src = fetchFromGitLab { + domain = "gitlab.freedesktop.org"; + owner = "vyivel"; + repo = "libsfdo"; + rev = "refs/tags/v${finalAttrs.version}"; + hash = "sha256-9jCfCIB07mmJ6aWQHvXaxYhEMNikUw/W1xrpmh6FKbo="; + }; + + strictDeps = true; + doCheck = true; + + nativeBuildInputs = [ + meson + ninja + pkg-config + validatePkgConfig + ]; + + passthru.tests.pkg-config = testers.hasPkgConfigModules { + package = finalAttrs.finalPackage; + versionCheck = true; + }; + + meta = { + description = "Collection of libraries which implement some of the freedesktop.org specifications"; + homepage = "https://gitlab.freedesktop.org/vyivel/libsfdo"; + license = lib.licenses.bsd2; + maintainers = [ lib.maintainers.zi3m5f ]; + pkgConfigModules = [ + "libsfdo-basedir" + "libsfdo-desktop-file" + "libsfdo-desktop" + "libsfdo-icon" + ]; + platforms = lib.platforms.all; + }; +}) From 96d23f8b562125e697d7e62ac8c53a7497efc294 Mon Sep 17 00:00:00 2001 From: zi3m5f <113244000+zi3m5f@users.noreply.github.com> Date: Mon, 28 Oct 2024 23:23:38 +0100 Subject: [PATCH 2/2] labwc: 0.8.0 -> 0.8.1 add libsfdo (https://github.com/labwc/labwc/blob/master/NEWS.md#081) and versionCheckHook --- pkgs/by-name/la/labwc/package.nix | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/la/labwc/package.nix b/pkgs/by-name/la/labwc/package.nix index 594a255bb989..2e610c83647a 100644 --- a/pkgs/by-name/la/labwc/package.nix +++ b/pkgs/by-name/la/labwc/package.nix @@ -8,6 +8,7 @@ libinput, libpng, librsvg, + libsfdo, libxcb, libxkbcommon, libxml2, @@ -17,6 +18,7 @@ pkg-config, scdoc, stdenv, + versionCheckHook, wayland, wayland-protocols, wayland-scanner, @@ -27,13 +29,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "labwc"; - version = "0.8.0"; + version = "0.8.1"; src = fetchFromGitHub { owner = "labwc"; repo = "labwc"; rev = "refs/tags/${finalAttrs.version}"; - hash = "sha256-1PyPk6r/hXkC0EfOIeDqNGrrpvo616derD9u7i3XjkA="; + hash = "sha256-TXxdjMkzZQoCqkZBqus5eCBEhA/nvxNNXaNHUTGFQDQ="; }; outputs = [ @@ -58,6 +60,7 @@ stdenv.mkDerivation (finalAttrs: { libinput libpng librsvg + libsfdo libxcb libxkbcommon libxml2 @@ -69,10 +72,15 @@ stdenv.mkDerivation (finalAttrs: { xwayland ]; + nativeInstallCheckInputs = [ versionCheckHook ]; + mesonFlags = [ (lib.mesonEnable "xwayland" true) ]; strictDeps = true; + doInstallCheck = true; + versionCheckProgramArg = "--version"; + passthru = { providedSessions = [ "labwc" ]; }; @@ -80,6 +88,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { homepage = "https://github.com/labwc/labwc"; description = "Wayland stacking compositor, inspired by Openbox"; + changelog = "https://github.com/labwc/labwc/blob/master/NEWS.md"; license = with lib.licenses; [ gpl2Plus ]; mainProgram = "labwc"; maintainers = with lib.maintainers; [ AndersonTorres ];