mate.mate-utils: 1.26.1 -> 1.28.0
https://github.com/mate-desktop/mate-utils/compare/v1.26.1...v1.28.0
This commit is contained in:
parent
2e4ba3d1c0
commit
540493afb9
@ -1,43 +1,34 @@
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchurl
|
||||
, fetchpatch
|
||||
, pkg-config
|
||||
, gettext
|
||||
, itstool
|
||||
, glib
|
||||
, gtk-layer-shell
|
||||
, gtk3
|
||||
, libxml2
|
||||
, libgtop
|
||||
, libcanberra-gtk3
|
||||
, inkscape
|
||||
, udisks2
|
||||
, mate
|
||||
, mate-desktop
|
||||
, mate-panel
|
||||
, hicolor-icon-theme
|
||||
, wayland
|
||||
, wrapGAppsHook
|
||||
, mateUpdateScript
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "mate-utils";
|
||||
version = "1.26.1";
|
||||
version = "1.28.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "L1NHWxoJkd1ak9ndpY/KTkFvJZJTWG2UpbEQjxI3BiA=";
|
||||
sha256 = "WESdeg0dkA/wO3jKn36Ywh6X9H/Ca+5/8cYYNPIviNM=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# Hopefully helps "libxml2.treeError: xmlSetProp() failed"
|
||||
# This patch is not part of upstream yet.
|
||||
# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=919058
|
||||
# https://github.com/mate-desktop/mate-utils/issues/210
|
||||
(fetchpatch {
|
||||
url = "https://salsa.debian.org/debian-mate-team/mate-utils/-/raw/2b43d78f3fdbf0aa50716b62bcada2ef015957c6/debian/patches/1001_fix-gsearchtool-pt-help-translation.patch";
|
||||
sha256 = "SZVpdup/bNv+3hEGQ0L13mgXyNm+wRcL53t9/Oi24wA=";
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
gettext
|
||||
@ -47,15 +38,28 @@ stdenv.mkDerivation rec {
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
gtk-layer-shell
|
||||
gtk3
|
||||
libgtop
|
||||
libcanberra-gtk3
|
||||
libxml2
|
||||
udisks2
|
||||
mate.mate-panel
|
||||
mate-desktop
|
||||
mate-panel
|
||||
hicolor-icon-theme
|
||||
wayland
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
# Workaround undefined version requirements
|
||||
# https://github.com/mate-desktop/mate-utils/issues/361
|
||||
substituteInPlace configure \
|
||||
--replace-fail '>= $GTK_LAYER_SHELL_REQUIRED_VERSION' "" \
|
||||
--replace-fail '>= $GDK_WAYLAND_REQUIRED_VERSION' ""
|
||||
'';
|
||||
|
||||
configureFlags = [ "--enable-wayland" ];
|
||||
|
||||
env.NIX_CFLAGS_COMPILE = "-I${glib.dev}/include/gio-unix-2.0";
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
Loading…
Reference in New Issue
Block a user