pyrox.dev / nixpkgs
lol
fork atom

Merge pull request #164948 from trofi/fix-meld-for-meson-0.60

meld: pull upstream fix for meson-0.60

authored by Anderson Torres and committed by GitHub 7e1810ce 1d512e62

+11
unified split
+11
pkgs/applications/version-management/meld/default.nix
··· 1 { lib 2 , fetchurl 3 , gettext 4 , itstool 5 , python3 ··· 26 url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; 27 sha256 = "cP6Y65Ms4h1nFw47D2pzF+gT6GLemJM+pROYLpoDMgI="; 28 }; 29 30 nativeBuildInputs = [ 31 meson
··· 1 { lib 2 , fetchurl 3 + , fetchpatch 4 , gettext 5 , itstool 6 , python3 ··· 27 url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; 28 sha256 = "cP6Y65Ms4h1nFw47D2pzF+gT6GLemJM+pROYLpoDMgI="; 29 }; 30 + 31 + patches = [ 32 + # Pull upstream fix for meson-0.60: 33 + # https://gitlab.gnome.org/GNOME/meld/-/merge_requests/78 34 + (fetchpatch { 35 + name = "meson-0.60.patch"; 36 + url = "https://gitlab.gnome.org/GNOME/meld/-/commit/cc7746c141d976a4779cf868774fae1fe7627a6d.patch"; 37 + sha256 = "sha256-4uJZyF00Z6svzrOebByZV1hutCZRkIQYC4rUxQr5fdQ="; 38 + }) 39 + ]; 40 41 nativeBuildInputs = [ 42 meson