Merge pull request #165565 from bobby285271/fractal

fractal: fix build with meson 0.61
This commit is contained in:
Bobby Rong 2022-03-24 16:13:27 +08:00 committed by GitHub
commit 3e6fb7d3b9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -1,5 +1,7 @@
{ lib, stdenv
{ stdenv
, lib
, fetchFromGitLab
, fetchpatch
, nix-update-script
, meson
, ninja
@ -33,6 +35,15 @@ stdenv.mkDerivation rec {
sha256 = "DSNVd9YvI7Dd3s3+M0+wE594tmL1yPNMnD1W9wLhSuw=";
};
patches = [
# Fix build with meson 0.61
# fractal-gtk/res/meson.build:5:0: ERROR: Function does not take positional arguments.
(fetchpatch {
url = "https://gitlab.gnome.org/GNOME/fractal/-/commit/6fa1a23596d65d94aa889efe725174e6cd2903f0.patch";
sha256 = "3OzU9XL2V1VNOkvL1j677K3HNoBqPMQudQDmiDxYfAc=";
})
];
cargoDeps = rustPlatform.fetchCargoTarball {
inherit src;
name = "${pname}-${version}";