Unverified Commit 2860a2ee authored by jopejoe1's avatar jopejoe1 Committed by GitHub
Browse files

labwc: 0.8.0 -> 0.8.1 (#351990)

parents 9e4d3d87 96d23f8b
Loading
Loading
Loading
Loading
+11 −2
Original line number Diff line number Diff line
@@ -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 ];
+51 −0
Original line number Diff line number Diff line
{
  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;
  };
})