swendel/nixpkgs
1
0
Fork 0
mirror of https://github.com/SebastianWendel/nixpkgs.git synced 2024-09-29 08:30:21 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #165558 from bobby285271/gnome-dictionary

Browse source 
gnome.gnome-dictionary: fix build with meson 0.61
This commit is contained in:
Jan Tojnar 2022-03-24 06:47:02 +01:00 committed by GitHub
parent 9d247b3bf6 24c7d32c22
commit 7e0a1f2eec
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 56 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

63
pkgs/desktops/gnome/core/gnome-dictionary/default.nix
View file

@ -1,6 +1,24 @@
{ lib, stdenv, fetchurl, meson, ninja, pkg-config, desktop-file-utils, appstream-glib, libxslt
, libxml2, gettext, itstool, wrapGAppsHook, docbook_xsl, docbook_xml_dtd_43
, gnome, gtk3, glib, gsettings-desktop-schemas }:
{ stdenv
, lib
, fetchurl
, fetchpatch
, meson
, ninja
, pkg-config
, desktop-file-utils
, appstream-glib
, libxslt
, libxml2
, gettext
, itstool
, wrapGAppsHook
, docbook_xsl
, docbook_xml_dtd_43
, gnome
, gtk3
, glib
, gsettings-desktop-schemas
}:
stdenv.mkDerivation rec {
pname = "gnome-dictionary";
@ -11,13 +29,44 @@ stdenv.mkDerivation rec {
sha256 = "1d8dhcfys788vv27v34i3s3x3jdvdi2kqn2a5p8c937a9hm0qr9f";
};
doCheck = true;
patches = [
# Fix test dependencies with meson 0.57, can be removed on next bump
# We need to explicitly depend on the generated files.
(fetchpatch {
url = "https://gitlab.gnome.org/GNOME/gnome-dictionary/-/commit/87c026cfe4acbcfc62d15950f88a71d8d9678c7e.patch";
sha256 = "tKesWeOK3OqOxrXm4dZvCZHHdTD7AQbYDjtYDCsLd3A=";
})
# Fix build with meson 0.61, can be removed on next bump
# data/appdata/meson.build:3:5: ERROR: Function does not take positional arguments.
(fetchpatch {
url = "https://gitlab.gnome.org/GNOME/gnome-dictionary/-/commit/cf3f8a67cd6f3059c555ed9cf0f5fba10abb7f68.patch";
sha256 = "cIRM6ACqsnEo2JWYvr6EBye5o0BudugZMShCe1U5hz8=";
})
];
nativeBuildInputs = [
meson ninja pkg-config wrapGAppsHook libxml2 gettext itstool
desktop-file-utils appstream-glib libxslt docbook_xsl docbook_xml_dtd_43
meson
ninja
pkg-config
wrapGAppsHook
libxml2
gettext
itstool
desktop-file-utils
appstream-glib
libxslt
docbook_xsl
docbook_xml_dtd_43
];
buildInputs = [ gtk3 glib gsettings-desktop-schemas gnome.adwaita-icon-theme ];
buildInputs = [
gtk3
glib
gsettings-desktop-schemas
gnome.adwaita-icon-theme
];
doCheck = true;
passthru = {
updateScript = gnome.updateScript {