alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

Merge pull request #165445 from bobby285271/glade

Browse source 
glade: fix build with meson 0.61
This commit is contained in:
Bobby Rong 2022-03-24 11:46:49 +08:00 committed by GitHub
parent 6dd4a7d853 b5bf88eb62
commit 763371ac58
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 19 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
pkgs/development/tools/glade/default.nix
View file

@ -1,6 +1,8 @@
{ lib, stdenv
{ stdenv
, lib
, gettext
, fetchurl
, fetchpatch
, python3
, meson
, ninja
@ -30,6 +32,22 @@ stdenv.mkDerivation rec {
sha256 = "1dxsiz9ahqkxg2a1dw9sbd8jg59y5pdz4c1gvnbmql48gmj8gz4q";
};
patches = [
# Fix build with meson 0.61
# data/meson.build:4:5: ERROR: Function does not take positional arguments.
# Taken from https://gitlab.gnome.org/GNOME/glade/-/merge_requests/117
(fetchpatch {
url = "https://gitlab.gnome.org/GNOME/glade/-/commit/61304b2e8bac8ded76643cb7c3e781f73881dd2b.patch";
sha256 = "9x6RK8Wgnm8bDxeBLV3PlUkUuH2706Ba9kwE5S87DgE=";
})
# help/meson.build:6:6: ERROR: Tried to create target "help-glade-da-update-po", but a target of that name already exists.
# Taken from https://gitlab.gnome.org/GNOME/glade/-/merge_requests/117
(fetchpatch {
url = "https://gitlab.gnome.org/GNOME/glade/-/commit/04ba6f969f716fbfe3c7feb7e4bab8678cc1e9eb.patch";
sha256 = "j3XfF7P6rndL+0PWqnp+QYph7Ba6bgcp4Pkikr2wuJA=";
})
];
nativeBuildInputs = [
meson
ninja