diff options
author | Nick Cao <nickcao@nichi.co> | 2023-12-22 09:45:58 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-12-22 09:45:58 -0500 |
commit | d344598838c4c3fff2c15a6f3a500ff231668c4f (patch) | |
tree | 6b1ce5a4e45f1b541dcb8fe5b0e298eeca41185f /pkgs | |
parent | 80b7e2bbc3365e957e7ff018e53637aad500e500 (diff) | |
parent | 74cff0aa8d4bcd631877fa1c25d79db726c1c9b6 (diff) |
Merge pull request #269359 from wineee/wlroots_17
{wlroots_0_17, tinywl, dwl, waybox, wio}: update
Diffstat (limited to 'pkgs')
-rw-r--r-- | pkgs/applications/window-managers/dwl/default.nix | 4 | ||||
-rw-r--r-- | pkgs/applications/window-managers/hyprwm/hyprland/wlroots.nix | 13 | ||||
-rw-r--r-- | pkgs/applications/window-managers/tinywl/default.nix | 16 | ||||
-rw-r--r-- | pkgs/by-name/wa/waybox/package.nix | 8 | ||||
-rw-r--r-- | pkgs/by-name/wi/wio/package.nix | 6 | ||||
-rw-r--r-- | pkgs/development/libraries/wlroots/default.nix | 36 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 9 |
7 files changed, 57 insertions, 35 deletions
diff --git a/pkgs/applications/window-managers/dwl/default.nix b/pkgs/applications/window-managers/dwl/default.nix index dc2f58b1d3a8f..0af274265bff8 100644 --- a/pkgs/applications/window-managers/dwl/default.nix +++ b/pkgs/applications/window-managers/dwl/default.nix @@ -22,13 +22,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "dwl"; - version = "0.4"; + version = "0.5"; src = fetchFromGitHub { owner = "djpohly"; repo = "dwl"; rev = "v${finalAttrs.version}"; - hash = "sha256-OW7K7yMYSzqZWpQ9Vmpy8EgdWvyv3q1uh8A40f6AQF4="; + hash = "sha256-U/vqGE1dJKgEGTfPMw02z5KJbZLWY1vwDJWnJxT8urM="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/window-managers/hyprwm/hyprland/wlroots.nix b/pkgs/applications/window-managers/hyprwm/hyprland/wlroots.nix index a77526abb508e..84c1c79598f9e 100644 --- a/pkgs/applications/window-managers/hyprwm/hyprland/wlroots.nix +++ b/pkgs/applications/window-managers/hyprwm/hyprland/wlroots.nix @@ -1,12 +1,9 @@ { fetchFromGitLab , wlroots -, libdisplay-info -, libliftoff -, hwdata }: wlroots.overrideAttrs (old: { - version = "0.17.0-dev"; + version = "0.18.0-dev"; src = fetchFromGitLab { domain = "gitlab.freedesktop.org"; @@ -16,11 +13,7 @@ wlroots.overrideAttrs hash = "sha256-7kvyoA91etzVEl9mkA/EJfB6z/PltxX7Xc4gcr7/xlo="; }; - pname = "${old.pname}-hyprland"; + patches = [ ]; # don't inherit old.patches - buildInputs = old.buildInputs ++ [ - hwdata - libdisplay-info - libliftoff - ]; + pname = "${old.pname}-hyprland"; }) diff --git a/pkgs/applications/window-managers/tinywl/default.nix b/pkgs/applications/window-managers/tinywl/default.nix index c0b147e6ee585..d39373e781929 100644 --- a/pkgs/applications/window-managers/tinywl/default.nix +++ b/pkgs/applications/window-managers/tinywl/default.nix @@ -4,25 +4,25 @@ stdenv.mkDerivation { pname = "tinywl"; - inherit (wlroots) version src; - - sourceRoot = "${wlroots.src.name}/tinywl"; + inherit (wlroots) version src patches postPatch; nativeBuildInputs = [ pkg-config wayland-scanner ]; buildInputs = [ libxkbcommon pixman udev wayland wayland-protocols wlroots ]; + makeFlags = [ "-C" "tinywl" ]; + installPhase = '' runHook preInstall mkdir -p $out/bin - cp tinywl $out/bin + cp tinywl/tinywl $out/bin runHook postInstall ''; - meta = with lib; { - homepage = "https://github.com/swaywm/wlroots/tree/master/tinywl"; + meta = { + homepage = "https://gitlab.freedesktop.org/wlroots/wlroots/tree/master/tinywl"; description = ''A "minimum viable product" Wayland compositor based on wlroots''; - maintainers = with maintainers; [ qyliss ] ++ wlroots.meta.maintainers; - license = licenses.cc0; + maintainers = with lib.maintainers; [ qyliss ] ++ wlroots.meta.maintainers; + license = lib.licenses.cc0; inherit (wlroots.meta) platforms; mainProgram = "tinywl"; }; diff --git a/pkgs/by-name/wa/waybox/package.nix b/pkgs/by-name/wa/waybox/package.nix index 3274660b07529..70ec30f50db29 100644 --- a/pkgs/by-name/wa/waybox/package.nix +++ b/pkgs/by-name/wa/waybox/package.nix @@ -5,6 +5,8 @@ , libGL , libxkbcommon , libxml2 +, libevdev +, libinput , mesa , meson , ninja @@ -19,13 +21,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "waybox"; - version = "0.2.0"; + version = "0.2.2"; src = fetchFromGitHub { owner = "wizbright"; repo = "waybox"; rev = finalAttrs.version; - hash = "sha256-G8dRa4hgev3x58uqp5To5OzF3zcPSuT3NL9MPnWf2M8="; + hash = "sha256-hAXS9laDfigWR2pfNmdPiOeez3NpTIuKHnpeQyYa9IQ="; }; nativeBuildInputs = [ @@ -40,6 +42,8 @@ stdenv.mkDerivation (finalAttrs: { libGL libxkbcommon libxml2 + libevdev + libinput mesa # for libEGL pixman udev diff --git a/pkgs/by-name/wi/wio/package.nix b/pkgs/by-name/wi/wio/package.nix index 73255a38208b8..e8378f2fc5606 100644 --- a/pkgs/by-name/wi/wio/package.nix +++ b/pkgs/by-name/wi/wio/package.nix @@ -20,13 +20,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "wio"; - version = "unstable-2023-05-28"; + version = "unstable-2023-11-23"; src = fetchFromGitHub { owner = "Rubo3"; repo = "wio"; - rev = "9d33d60839d3005ee16b5b04ae7f42c049939058"; - hash = "sha256-ylJ8VHQU4TWLrhxGRo6HHOB7RWTVAThMQRw0uAFboNE="; + rev = "77c33b555589068350078d634a256a8fbb7ffe6b"; + hash = "sha256-Wff8RPHfmgPYJ3cO0h5onHtWIvOYDqLjvF1O4uODuCY="; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/wlroots/default.nix b/pkgs/development/libraries/wlroots/default.nix index 789625f2f9f37..8b4abf7d5d12f 100644 --- a/pkgs/development/libraries/wlroots/default.nix +++ b/pkgs/development/libraries/wlroots/default.nix @@ -1,6 +1,7 @@ { lib , stdenv , fetchFromGitLab +, fetchpatch , meson , ninja , pkg-config @@ -20,6 +21,8 @@ , seatd , vulkan-loader , glslang +, libliftoff +, libdisplay-info , nixosTests , enableXWayland ? true @@ -27,7 +30,7 @@ }: let - generic = { version, hash, extraBuildInputs ? [ ], extraNativeBuildInputs ? [ ], extraPatch ? "" }: + generic = { version, hash, extraBuildInputs ? [ ], extraNativeBuildInputs ? [ ], patches ? [ ], postPatch ? "" }: stdenv.mkDerivation (finalAttrs: { pname = "wlroots"; inherit version; @@ -42,7 +45,7 @@ let inherit hash; }; - postPatch = extraPatch; + inherit patches postPatch; # $out for the library and $examples for the example programs (in examples): outputs = [ "out" "examples" ]; @@ -94,7 +97,7 @@ let # Test via TinyWL (the "minimum viable product" Wayland compositor based on wlroots): passthru.tests.tinywl = nixosTests.tinywl; - meta = with lib; { + meta = { description = "A modular Wayland compositor library"; longDescription = '' Pluggable, composable, unopinionated modules for building a Wayland @@ -102,9 +105,9 @@ let ''; inherit (finalAttrs.src.meta) homepage; changelog = "https://gitlab.freedesktop.org/wlroots/wlroots/-/tags/${version}"; - license = licenses.mit; - platforms = platforms.linux; - maintainers = with maintainers; [ primeos synthetica ]; + license = lib.licenses.mit; + platforms = lib.platforms.linux; + maintainers = with lib.maintainers; [ primeos synthetica rewine ]; }; }); @@ -118,11 +121,28 @@ rec { wlroots_0_16 = generic { version = "0.16.2"; hash = "sha256-JeDDYinio14BOl6CbzAPnJDOnrk4vgGNMN++rcy2ItQ="; - extraPatch = '' + postPatch = '' substituteInPlace backend/drm/meson.build \ --replace /usr/share/hwdata/ ${hwdata}/share/hwdata/ ''; }; - wlroots = wlroots_0_16; + wlroots_0_17 = generic { + version = "0.17.0"; + hash = "sha256-VUrnSG4UAAH0cBy15lG0w8RernwegD6lkOdLvWU3a4c="; + extraBuildInputs = [ + hwdata + libliftoff + libdisplay-info + ]; + patches = [ + (fetchpatch { + name = "tinywl-fix-wlroots-dependency-constraint-in-Makefile.patch"; + url = "https://gitlab.freedesktop.org/wlroots/wlroots/-/commit/fe53ec693789afb44c899cad8c2df70c8f9f9023.patch"; + hash = "sha256-wU62hXgmsAyT5j/bWeCFBkvM9cYjUntdCycQt5HAhb8="; + }) + ]; + }; + + wlroots = wlroots_0_17; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3d7d5417391e3..4ab66f6d9b669 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14979,6 +14979,10 @@ with pkgs; whsniff = callPackage ../applications/networking/sniffers/whsniff { }; + wio = callPackage ../by-name/wi/wio/package.nix { + wlroots = wlroots_0_17; + }; + wiiuse = callPackage ../development/libraries/wiiuse { inherit (darwin) libobjc; inherit (darwin.apple_sdk.frameworks) Foundation IOBluetooth; @@ -31287,7 +31291,7 @@ with pkgs; dyff = callPackage ../development/tools/dyff { }; dwl = callPackage ../applications/window-managers/dwl { - wlroots = wlroots_0_16; + wlroots = wlroots_0_17; }; dwm = callPackage ../applications/window-managers/dwm { @@ -32655,6 +32659,7 @@ with pkgs; inherit (callPackages ../development/libraries/wlroots {}) wlroots_0_15 wlroots_0_16 + wlroots_0_17 wlroots; sway-contrib = recurseIntoAttrs (callPackages ../applications/misc/sway-contrib { }); @@ -32754,7 +32759,7 @@ with pkgs; kitti3 = python3.pkgs.callPackage ../applications/window-managers/i3/kitti3.nix { }; waybox = callPackage ../by-name/wa/waybox/package.nix { - wlroots = wlroots_0_15; + wlroots = wlroots_0_17; }; workstyle = callPackage ../applications/window-managers/i3/workstyle.nix { }; |