pyrox.dev / nixpkgs
lol
fork atom

Merge pull request #165445 from bobby285271/glade

glade: fix build with meson 0.61

authored by

Bobby Rong and committed by
GitHub 763371ac 6dd4a7d8

+19 -1
unified split
+19 -1
pkgs/development/tools/glade/default.nix
··· 1 - { lib, stdenv 2 , gettext 3 , fetchurl 4 , python3 5 , meson 6 , ninja ··· 29 url = "mirror://gnome/sources/glade/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; 30 sha256 = "1dxsiz9ahqkxg2a1dw9sbd8jg59y5pdz4c1gvnbmql48gmj8gz4q"; 31 }; 32 33 nativeBuildInputs = [ 34 meson
··· 1 + { stdenv 2 + , lib 3 , gettext 4 , fetchurl 5 + , fetchpatch 6 , python3 7 , meson 8 , ninja ··· 31 url = "mirror://gnome/sources/glade/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; 32 sha256 = "1dxsiz9ahqkxg2a1dw9sbd8jg59y5pdz4c1gvnbmql48gmj8gz4q"; 33 }; 34 + 35 + patches = [ 36 + # Fix build with meson 0.61 37 + # data/meson.build:4:5: ERROR: Function does not take positional arguments. 38 + # Taken from https://gitlab.gnome.org/GNOME/glade/-/merge_requests/117 39 + (fetchpatch { 40 + url = "https://gitlab.gnome.org/GNOME/glade/-/commit/61304b2e8bac8ded76643cb7c3e781f73881dd2b.patch"; 41 + sha256 = "9x6RK8Wgnm8bDxeBLV3PlUkUuH2706Ba9kwE5S87DgE="; 42 + }) 43 + # help/meson.build:6:6: ERROR: Tried to create target "help-glade-da-update-po", but a target of that name already exists. 44 + # Taken from https://gitlab.gnome.org/GNOME/glade/-/merge_requests/117 45 + (fetchpatch { 46 + url = "https://gitlab.gnome.org/GNOME/glade/-/commit/04ba6f969f716fbfe3c7feb7e4bab8678cc1e9eb.patch"; 47 + sha256 = "j3XfF7P6rndL+0PWqnp+QYph7Ba6bgcp4Pkikr2wuJA="; 48 + }) 49 + ]; 50 51 nativeBuildInputs = [ 52 meson