gnome3.iagno: fix build
* add patch fixing build with Meson > 0.55 * clean up * do not use pkg-config alias * drop redundant parallel building (on by default with Meson) * format expression * make license explicit
This commit is contained in:
parent
a2f9d7c2f3
commit
291bb3c859
@ -1,6 +1,20 @@
|
||||
{ stdenv, fetchurl, pkgconfig, gtk3, gnome3, gdk-pixbuf, librsvg, wrapGAppsHook
|
||||
, itstool, gsound, libxml2
|
||||
, meson, ninja, python3, vala, desktop-file-utils
|
||||
{ stdenv
|
||||
, fetchurl
|
||||
, fetchpatch
|
||||
, pkg-config
|
||||
, gtk3
|
||||
, gnome3
|
||||
, gdk-pixbuf
|
||||
, librsvg
|
||||
, wrapGAppsHook
|
||||
, itstool
|
||||
, gsound
|
||||
, libxml2
|
||||
, meson
|
||||
, ninja
|
||||
, python3
|
||||
, vala
|
||||
, desktop-file-utils
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
@ -12,13 +26,34 @@ stdenv.mkDerivation rec {
|
||||
sha256 = "1fh2cvyqbz8saf2wij0bz2r9bja2k4gy6fqvbvig4gv0lx66gl29";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
meson ninja python3 vala desktop-file-utils
|
||||
pkgconfig wrapGAppsHook itstool libxml2
|
||||
patches = [
|
||||
# Fix build with Meson 0.55
|
||||
# https://gitlab.gnome.org/GNOME/iagno/-/issues/16
|
||||
(fetchpatch {
|
||||
url = "https://gitlab.gnome.org/GNOME/iagno/commit/0100bab269f2102f24a6e41202b931da1b6e8dc5.patch";
|
||||
sha256 = "ZW75s+bV45ivwA+SKUN7ejSvnXYEo/kYQjDVvFBA/sg=";
|
||||
})
|
||||
];
|
||||
buildInputs = [ gtk3 gnome3.adwaita-icon-theme gdk-pixbuf librsvg gsound ];
|
||||
|
||||
enableParallelBuilding = true;
|
||||
nativeBuildInputs = [
|
||||
meson
|
||||
ninja
|
||||
python3
|
||||
vala
|
||||
desktop-file-utils
|
||||
pkg-config
|
||||
wrapGAppsHook
|
||||
itstool
|
||||
libxml2
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
gtk3
|
||||
gnome3.adwaita-icon-theme
|
||||
gdk-pixbuf
|
||||
librsvg
|
||||
gsound
|
||||
];
|
||||
|
||||
passthru = {
|
||||
updateScript = gnome3.updateScript {
|
||||
@ -31,7 +66,7 @@ stdenv.mkDerivation rec {
|
||||
homepage = "https://wiki.gnome.org/Apps/Iagno";
|
||||
description = "Computer version of the game Reversi, more popularly called Othello";
|
||||
maintainers = teams.gnome.members;
|
||||
license = licenses.gpl2;
|
||||
license = licenses.gpl3Plus;
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user