From 61b5e8524eab94275cc9188b373560b646b0f51c Mon Sep 17 00:00:00 2001 From: Raghuram Subramani Date: Fri, 3 Jan 2025 21:52:55 +0530 Subject: switch to master temporarily --- packages/dwlb.nix | 2 +- packages/wayland-protocols.nix | 4 +-- packages/wbg.nix | 74 ++++++++++++++++++++++++++++++++++++++++++ packages/wlroots.nix | 4 +-- 4 files changed, 79 insertions(+), 5 deletions(-) create mode 100644 packages/wbg.nix (limited to 'packages') diff --git a/packages/dwlb.nix b/packages/dwlb.nix index c6e21b4..cc03292 100644 --- a/packages/dwlb.nix +++ b/packages/dwlb.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "compromyse"; repo = "dwlb"; rev = "compromyse"; - hash = "sha256-3K0MUdnsI2fFcsIQhTI5Vhw1ODgN/ii0imhLdxJNUqU="; + hash = "sha256-9IRGC6q4v67ybRjh6guLFa8W4kHfAbRFY4Mit/mx+jE="; }; nativeBuildInputs = [ diff --git a/packages/wayland-protocols.nix b/packages/wayland-protocols.nix index 76976be..0db8d45 100644 --- a/packages/wayland-protocols.nix +++ b/packages/wayland-protocols.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "wayland-protocols"; - version = "1.38"; + version = "1.39"; doCheck = stdenv.hostPlatform == stdenv.buildPlatform && # https://gitlab.freedesktop.org/wayland/wayland-protocols/-/issues/48 @@ -15,7 +15,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchurl { url = "https://gitlab.freedesktop.org/wayland/${finalAttrs.pname}/-/releases/${finalAttrs.version}/downloads/${finalAttrs.pname}-${finalAttrs.version}.tar.xz"; - hash = "sha256-/xcpLAUVnSsgzmys/kLX4xooGY+hQpp2mwOvfDhYHb4="; + hash = "sha256-4dzcu/COLgqKAu5dmgvjpqr8OaS1H6fg0vGhZBHLcvo="; }; postPatch = lib.optionalString finalAttrs.doCheck '' diff --git a/packages/wbg.nix b/packages/wbg.nix new file mode 100644 index 0000000..b9ef787 --- /dev/null +++ b/packages/wbg.nix @@ -0,0 +1,74 @@ +{ + stdenv, + lib, + fetchFromGitea, + pkg-config, + meson, + ninja, + pixman, + tllist, + wayland, + wayland-scanner, + wayland-protocols, + nanosvg, + libjxl, + enablePNG ? true, + enableJPEG ? true, + enableWebp ? true, + # Optional dependencies + libpng, + libjpeg, + libwebp, +}: + +stdenv.mkDerivation rec { + pname = "wbg"; + version = "1.2.0"; + + src = fetchFromGitea { + domain = "codeberg.org"; + owner = "dnkl"; + repo = "wbg"; + rev = "master"; + hash = "sha256-ikwOVtR5cXZGd2GE/O4ej6cOQZomyEKkPcKe08EtPw0="; + }; + + nativeBuildInputs = [ + pkg-config + meson + ninja + wayland-scanner + ]; + + buildInputs = + [ + pixman + tllist + wayland + wayland-protocols + nanosvg + libjxl + ] + ++ lib.optional enablePNG libpng + ++ lib.optional enableJPEG libjpeg + ++ lib.optional enableWebp libwebp; + + mesonBuildType = "release"; + + mesonFlags = [ + (lib.mesonEnable "system-nanosvg" true) + (lib.mesonEnable "png" enablePNG) + (lib.mesonEnable "jpeg" enableJPEG) + (lib.mesonEnable "webp" enableWebp) + ]; + + meta = with lib; { + description = "Wallpaper application for Wayland compositors"; + homepage = "https://codeberg.org/dnkl/wbg"; + changelog = "https://codeberg.org/dnkl/wbg/releases/tag/${version}"; + license = licenses.isc; + maintainers = with maintainers; [ ]; + platforms = with platforms; linux; + mainProgram = "wbg"; + }; +} diff --git a/packages/wlroots.nix b/packages/wlroots.nix index c632018..4978a93 100644 --- a/packages/wlroots.nix +++ b/packages/wlroots.nix @@ -15,8 +15,8 @@ let repo = "wlroots"; repo_git = "https://${domain}/${owner}/${repo}"; branch = "master"; - rev = "d835fa813f82501eb668708af33afc42010707cf"; - sha256 = "sha256-YXLa0fjqND7Gys4KK/CZmRqGU70gMVqU3T+j+e6S9qw="; + rev = "38923826c3bd2c8d5752b63570063282e658e2b0"; + sha256 = "sha256-G4P26O08N7zDj3ehhPwqYQm82ij4oI4SI4eehvSagc8="; }; ignore = [ "wlroots" -- cgit v1.2.3