xfce.xfce4-settings: Move away from mkXfceDerivation
To reduce the diff when build system change comes. mkXfceDerivation is generally pointless with meson.
This commit is contained in:
@@ -1,7 +1,12 @@
|
||||
{
|
||||
stdenv,
|
||||
lib,
|
||||
mkXfceDerivation,
|
||||
fetchFromGitLab,
|
||||
gettext,
|
||||
pkg-config,
|
||||
xfce4-dev-tools,
|
||||
wayland-scanner,
|
||||
wrapGAppsHook3,
|
||||
exo,
|
||||
garcon,
|
||||
gtk3,
|
||||
@@ -23,17 +28,27 @@
|
||||
xf86inputlibinput,
|
||||
colord,
|
||||
withColord ? true,
|
||||
gitUpdater,
|
||||
}:
|
||||
|
||||
mkXfceDerivation {
|
||||
category = "xfce";
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "xfce4-settings";
|
||||
version = "4.20.2";
|
||||
|
||||
sha256 = "sha256-hx1ilXPcwWWDwNR/k2b+9vR5aCv9UlPR0d42OE6JxEk=";
|
||||
src = fetchFromGitLab {
|
||||
domain = "gitlab.xfce.org";
|
||||
owner = "xfce";
|
||||
repo = "xfce4-settings";
|
||||
tag = "xfce4-settings-${finalAttrs.version}";
|
||||
hash = "sha256-hx1ilXPcwWWDwNR/k2b+9vR5aCv9UlPR0d42OE6JxEk=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
gettext
|
||||
pkg-config
|
||||
xfce4-dev-tools
|
||||
wayland-scanner
|
||||
wrapGAppsHook3
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
@@ -56,6 +71,7 @@ mkXfceDerivation {
|
||||
++ lib.optionals withColord [ colord ];
|
||||
|
||||
configureFlags = [
|
||||
"--enable-maintainer-mode"
|
||||
"--enable-pluggable-dialogs"
|
||||
"--enable-sound-settings"
|
||||
(lib.enableFeature withXrandr "xrandr")
|
||||
@@ -63,8 +79,19 @@ mkXfceDerivation {
|
||||
++ lib.optionals withUpower [ "--enable-upower-glib" ]
|
||||
++ lib.optionals withColord [ "--enable-colord" ];
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
passthru.updateScript = gitUpdater {
|
||||
rev-prefix = "xfce4-settings-";
|
||||
odd-unstable = true;
|
||||
};
|
||||
|
||||
meta = {
|
||||
description = "Settings manager for Xfce";
|
||||
homepage = "https://gitlab.xfce.org/xfce/xfce4-settings";
|
||||
license = lib.licenses.gpl2Plus;
|
||||
mainProgram = "xfce4-settings-manager";
|
||||
platforms = lib.platforms.linux;
|
||||
teams = [ lib.teams.xfce ];
|
||||
};
|
||||
}
|
||||
})
|
||||
|
||||
Reference in New Issue
Block a user