wlroots_0_17: init at 0.17.0
This commit is contained in:
parent
43edc09698
commit
3e1dba866f
|
@ -1,6 +1,7 @@
|
||||||
{ lib
|
{ lib
|
||||||
, stdenv
|
, stdenv
|
||||||
, fetchFromGitLab
|
, fetchFromGitLab
|
||||||
|
, fetchpatch
|
||||||
, meson
|
, meson
|
||||||
, ninja
|
, ninja
|
||||||
, pkg-config
|
, pkg-config
|
||||||
|
@ -20,6 +21,8 @@
|
||||||
, seatd
|
, seatd
|
||||||
, vulkan-loader
|
, vulkan-loader
|
||||||
, glslang
|
, glslang
|
||||||
|
, libliftoff
|
||||||
|
, libdisplay-info
|
||||||
, nixosTests
|
, nixosTests
|
||||||
|
|
||||||
, enableXWayland ? true
|
, enableXWayland ? true
|
||||||
|
@ -27,7 +30,7 @@
|
||||||
}:
|
}:
|
||||||
|
|
||||||
let
|
let
|
||||||
generic = { version, hash, extraBuildInputs ? [ ], extraNativeBuildInputs ? [ ], extraPatch ? "" }:
|
generic = { version, hash, extraBuildInputs ? [ ], extraNativeBuildInputs ? [ ], extraPatch ? [ ], extraPostPatch ? "" }:
|
||||||
stdenv.mkDerivation (finalAttrs: {
|
stdenv.mkDerivation (finalAttrs: {
|
||||||
pname = "wlroots";
|
pname = "wlroots";
|
||||||
inherit version;
|
inherit version;
|
||||||
|
@ -42,7 +45,9 @@ let
|
||||||
inherit hash;
|
inherit hash;
|
||||||
};
|
};
|
||||||
|
|
||||||
postPatch = extraPatch;
|
patches = extraPatch;
|
||||||
|
|
||||||
|
postPatch = extraPostPatch;
|
||||||
|
|
||||||
# $out for the library and $examples for the example programs (in examples):
|
# $out for the library and $examples for the example programs (in examples):
|
||||||
outputs = [ "out" "examples" ];
|
outputs = [ "out" "examples" ];
|
||||||
|
@ -94,7 +99,7 @@ let
|
||||||
# Test via TinyWL (the "minimum viable product" Wayland compositor based on wlroots):
|
# Test via TinyWL (the "minimum viable product" Wayland compositor based on wlroots):
|
||||||
passthru.tests.tinywl = nixosTests.tinywl;
|
passthru.tests.tinywl = nixosTests.tinywl;
|
||||||
|
|
||||||
meta = with lib; {
|
meta = {
|
||||||
description = "A modular Wayland compositor library";
|
description = "A modular Wayland compositor library";
|
||||||
longDescription = ''
|
longDescription = ''
|
||||||
Pluggable, composable, unopinionated modules for building a Wayland
|
Pluggable, composable, unopinionated modules for building a Wayland
|
||||||
|
@ -102,9 +107,9 @@ let
|
||||||
'';
|
'';
|
||||||
inherit (finalAttrs.src.meta) homepage;
|
inherit (finalAttrs.src.meta) homepage;
|
||||||
changelog = "https://gitlab.freedesktop.org/wlroots/wlroots/-/tags/${version}";
|
changelog = "https://gitlab.freedesktop.org/wlroots/wlroots/-/tags/${version}";
|
||||||
license = licenses.mit;
|
license = lib.licenses.mit;
|
||||||
platforms = platforms.linux;
|
platforms = lib.platforms.linux;
|
||||||
maintainers = with maintainers; [ primeos synthetica ];
|
maintainers = with lib.maintainers; [ primeos synthetica rewine ];
|
||||||
};
|
};
|
||||||
});
|
});
|
||||||
|
|
||||||
|
@ -118,11 +123,28 @@ rec {
|
||||||
wlroots_0_16 = generic {
|
wlroots_0_16 = generic {
|
||||||
version = "0.16.2";
|
version = "0.16.2";
|
||||||
hash = "sha256-JeDDYinio14BOl6CbzAPnJDOnrk4vgGNMN++rcy2ItQ=";
|
hash = "sha256-JeDDYinio14BOl6CbzAPnJDOnrk4vgGNMN++rcy2ItQ=";
|
||||||
extraPatch = ''
|
extraPostPatch = ''
|
||||||
substituteInPlace backend/drm/meson.build \
|
substituteInPlace backend/drm/meson.build \
|
||||||
--replace /usr/share/hwdata/ ${hwdata}/share/hwdata/
|
--replace /usr/share/hwdata/ ${hwdata}/share/hwdata/
|
||||||
'';
|
'';
|
||||||
};
|
};
|
||||||
|
|
||||||
|
wlroots_0_17 = generic {
|
||||||
|
version = "0.17.0";
|
||||||
|
hash = "sha256-VUrnSG4UAAH0cBy15lG0w8RernwegD6lkOdLvWU3a4c=";
|
||||||
|
extraBuildInputs = [
|
||||||
|
hwdata
|
||||||
|
libliftoff
|
||||||
|
libdisplay-info
|
||||||
|
];
|
||||||
|
extraPatch = [
|
||||||
|
(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_16;
|
wlroots = wlroots_0_16;
|
||||||
}
|
}
|
||||||
|
|
|
@ -32644,6 +32644,7 @@ with pkgs;
|
||||||
inherit (callPackages ../development/libraries/wlroots {})
|
inherit (callPackages ../development/libraries/wlroots {})
|
||||||
wlroots_0_15
|
wlroots_0_15
|
||||||
wlroots_0_16
|
wlroots_0_16
|
||||||
|
wlroots_0_17
|
||||||
wlroots;
|
wlroots;
|
||||||
|
|
||||||
sway-unwrapped = callPackage ../applications/window-managers/sway {
|
sway-unwrapped = callPackage ../applications/window-managers/sway {
|
||||||
|
|
Loading…
Reference in New Issue
Block a user