Merge pull request #75030 from dtzWill/update/fractal-4.2.2

fractal: 4.2.0 -> 4.2.2
This commit is contained in:
worldofpeace 2019-12-05 21:34:32 +00:00 committed by GitHub
commit d49dba4b3b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -9,7 +9,7 @@
, python3
, rustPlatform
, pkgconfig
, gtksourceview
, gtksourceview4
, glib
, libhandy
, gtk3
@ -25,17 +25,17 @@
rustPlatform.buildRustPackage rec {
pname = "fractal";
version = "4.2.0";
version = "4.2.2";
src = fetchFromGitLab {
domain = "gitlab.gnome.org";
owner = "GNOME";
repo = "fractal";
rev = version;
sha256 = "0clwsmd6h759bzlazfq5ig56dbx7npx3h43yspk87j1rm2dp1177";
sha256 = "0r98km3c8naj3mdr1wppzj823ir7jnsia7r3cbg3vsq8q52i480r";
};
cargoSha256 = "1hwjajkphl5439dymglgj3h92hxgbf7xpipzrga7ga8m10nx1dhl";
cargoSha256 = "1n9n4d057cz44sh1iy2hb2adplhnrhvr8drnp0v2h8yw73a5shvv";
nativeBuildInputs = [
cargo
@ -58,21 +58,14 @@ rustPlatform.buildRustPackage rec {
gst_all_1.gst-plugins-bad
gst_all_1.gst-plugins-base
gst_all_1.gstreamer
gst_all_1.gst-validate
gtk3
gtksourceview
gtksourceview4
libhandy
openssl
sqlite
];
cargoPatches = [
# https://gitlab.gnome.org/GNOME/fractal/merge_requests/446
(fetchpatch {
url = "https://gitlab.gnome.org/GNOME/fractal/commit/2778acdc6c50bc6f034513029b66b0b092bc4c38.patch";
sha256 = "08v17xmbwrjw688ps4hsnd60d5fm26xj72an3zf6yszha2b97j6y";
})
];
postPatch = ''
chmod +x scripts/test.sh
patchShebangs scripts/meson_post_install.py scripts/test.sh