Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fractal: 4.2.0 -> 4.2.2 #75030

Merged
merged 1 commit into from Dec 5, 2019
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
Expand Up @@ -9,7 +9,7 @@
, python3
, rustPlatform
, pkgconfig
, gtksourceview
, gtksourceview4
, glib
, libhandy
, gtk3
Expand All @@ -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
Expand All @@ -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
Expand Down