mirrors/nixpkgs
1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-28 16:42:09 +00:00
Code Issues Wiki Activity

gnome3.iagno: fix build

Browse source 
* 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:
Jan Tojnar 2020-10-23 06:42:21 +02:00
parent a2f9d7c2f3
commit 291bb3c859
No known key found for this signature in database
GPG key ID: 7FAB2A15F7A607A4
1 changed files with 44 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

53
pkgs/desktops/gnome-3/games/iagno/default.nix
View file

@ -1,6 +1,20 @@
{ stdenv, fetchurl, pkgconfig, gtk3, gnome3, gdk-pixbuf, librsvg, wrapGAppsHook { stdenv
, itstool, gsound, libxml2 , fetchurl
, meson, ninja, python3, vala, desktop-file-utils , fetchpatch
, pkg-config
, gtk3
, gnome3
, gdk-pixbuf
, librsvg
, wrapGAppsHook
, itstool
, gsound
, libxml2
, meson
, ninja
, python3
, vala
, desktop-file-utils
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
@ -12,13 +26,34 @@ stdenv.mkDerivation rec {
sha256 = "1fh2cvyqbz8saf2wij0bz2r9bja2k4gy6fqvbvig4gv0lx66gl29"; sha256 = "1fh2cvyqbz8saf2wij0bz2r9bja2k4gy6fqvbvig4gv0lx66gl29";
}; };
nativeBuildInputs = [ patches = [
meson ninja python3 vala desktop-file-utils # Fix build with Meson 0.55
pkgconfig wrapGAppsHook itstool libxml2 # 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 = { passthru = {
updateScript = gnome3.updateScript { updateScript = gnome3.updateScript {
@ -31,7 +66,7 @@ stdenv.mkDerivation rec {
homepage = "https://wiki.gnome.org/Apps/Iagno"; homepage = "https://wiki.gnome.org/Apps/Iagno";
description = "Computer version of the game Reversi, more popularly called Othello"; description = "Computer version of the game Reversi, more popularly called Othello";
maintainers = teams.gnome.members; maintainers = teams.gnome.members;
license = licenses.gpl2; license = licenses.gpl3Plus;
platforms = platforms.linux; platforms = platforms.linux;
}; };
} }