diff options
Diffstat (limited to 'nixpkgs/pkgs/development/tools/glade/default.nix')
| -rw-r--r-- | nixpkgs/pkgs/development/tools/glade/default.nix | 20 |
1 files changed, 19 insertions, 1 deletions
diff --git a/nixpkgs/pkgs/development/tools/glade/default.nix b/nixpkgs/pkgs/development/tools/glade/default.nix index 3e5c7b0438fd..adec880eabe0 100644 --- a/nixpkgs/pkgs/development/tools/glade/default.nix +++ b/nixpkgs/pkgs/development/tools/glade/default.nix @@ -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 |