b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge pull request #165428 from bobby285271/gnome-tetravex

Browse source 
gnome.gnome-tetravex: fix build with meson 0.61
This commit is contained in:
Bobby Rong 2022-03-24 12:00:31 +08:00 committed by GitHub
parent 9720a6b48e 14e42ff7f6
commit 79fc85e904
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 45 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1,6 +1,19 @@
{ lib, stdenv, fetchurl, pkg-config, gnome, gtk3, wrapGAppsHook
, libxml2, gettext, itstool, meson, ninja, python3
, vala, desktop-file-utils
{ stdenv
, lib
, fetchurl
, fetchpatch
, pkg-config
, gnome
, gtk3
, wrapGAppsHook
, libxml2
, gettext
, itstool
, meson
, ninja
, python3
, vala
, desktop-file-utils
}:
stdenv.mkDerivation rec {
@ -12,14 +25,31 @@ stdenv.mkDerivation rec {
sha256 = "06wihvqp2p52zd2dnknsc3rii69qib4a30yp15h558xrg44z3k8z";
};
passthru = {
updateScript = gnome.updateScript { packageName = "gnome-tetravex"; attrPath = "gnome.gnome-tetravex"; };
};
patches = [
# Fix build with meson 0.61
# data/meson.build:37:0: ERROR: Function does not take positional arguments.
# data/meson.build:59:0: ERROR: Function does not take positional arguments.
# Taken from https://gitlab.gnome.org/GNOME/gnome-tetravex/-/merge_requests/20
(fetchpatch {
url = "https://gitlab.gnome.org/GNOME/gnome-tetravex/-/commit/80912d06f5e588f6aca966fa516103275e58d94e.patch";
sha256 = "2+nFw5sJzbInibKaq3J10Ufbl3CnZWlgnUtzRTZ5G0I=";
})
];
nativeBuildInputs = [
wrapGAppsHook itstool libxml2 gnome.adwaita-icon-theme
pkg-config gettext meson ninja python3 vala desktop-file-utils
wrapGAppsHook
itstool
libxml2
gnome.adwaita-icon-theme
pkg-config
gettext
meson
ninja
python3
vala
desktop-file-utils
];
buildInputs = [
gtk3
];
@ -29,6 +59,13 @@ stdenv.mkDerivation rec {
patchShebangs build-aux/meson_post_install.py
'';
passthru = {
updateScript = gnome.updateScript {
packageName = "gnome-tetravex";
attrPath = "gnome.gnome-tetravex";
};
};
meta = with lib; {
homepage = "https://wiki.gnome.org/Apps/Tetravex";
description = "Complete the puzzle by matching numbered tiles";