public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fractal: 4.0.0 -> 4.2.0 

Build system changes happening in the following commits:

* 79bf10af6d
* 6982765607
* 4abfa58282

Submitted MR upstream to update Cargo.lock [0] and to
make scripts executable [1].

[0]: https://gitlab.gnome.org/GNOME/fractal/merge_requests/446
[1]: https://gitlab.gnome.org/GNOME/fractal/merge_requests/447
This commit is contained in:
worldofpeace 2019-07-30 15:12:24 -04:00
parent 37158a3410
commit 43dcb0542f
1 changed files with 17 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
pkgs/applications/networking/instant-messengers/fractal/default.nix
View File

@ -1,5 +1,6 @@
{ stdenv { stdenv
, fetchFromGitLab , fetchFromGitLab
, fetchpatch
, meson , meson
, ninja , ninja
, gettext , gettext
@ -13,28 +14,29 @@
, glib , glib
, libhandy , libhandy
, gtk3 , gtk3
, libsecret
, dbus , dbus
, openssl , openssl
, sqlite , sqlite
, gst_all_1 , gst_all_1
, cairo
, gdk_pixbuf
, gspell
, wrapGAppsHook , wrapGAppsHook
, fetchpatch
}: }:
rustPlatform.buildRustPackage rec { rustPlatform.buildRustPackage rec {
pname = "fractal"; pname = "fractal";
version = "4.0.0"; version = "4.2.0";
src = fetchFromGitLab { src = fetchFromGitLab {
domain = "gitlab.gnome.org"; domain = "gitlab.gnome.org";
owner = "GNOME"; owner = "GNOME";
repo = "fractal"; repo = "fractal";
rev = version; rev = version;
sha256 = "05q47jdgbi5jz01280msb8gxnbsrgf2jvglfm6k40f1xw4wxkrzy"; sha256 = "0clwsmd6h759bzlazfq5ig56dbx7npx3h43yspk87j1rm2dp1177";
}; };
cargoSha256 = "1ax5dv200v8mfx0418bx8sbwpbp6zj469xg75hp78kqfiv83pn1g"; cargoSha256 = "1hwjajkphl5439dymglgj3h92hxgbf7xpipzrga7ga8m10nx1dhl";
nativeBuildInputs = [ nativeBuildInputs = [
cargo cargo
@ -48,8 +50,12 @@ rustPlatform.buildRustPackage rec {
]; ];
buildInputs = [ buildInputs = [
cairo
dbus dbus
gdk_pixbuf
glib glib
gspell
gst_all_1.gst-editing-services
gst_all_1.gst-plugins-bad gst_all_1.gst-plugins-bad
gst_all_1.gst-plugins-base gst_all_1.gst-plugins-base
gst_all_1.gstreamer gst_all_1.gstreamer
@ -57,21 +63,21 @@ rustPlatform.buildRustPackage rec {
gtksourceview gtksourceview
hicolor-icon-theme hicolor-icon-theme
libhandy libhandy
libsecret
openssl openssl
sqlite sqlite
]; ];
patches = [ cargoPatches = [
# Fixes build with >= gstreamer 1.15.1 # https://gitlab.gnome.org/GNOME/fractal/merge_requests/446
(fetchpatch { (fetchpatch {
url = "https://gitlab.gnome.org/GNOME/fractal/commit/e78f36c25c095ea09c9c421187593706ad7c4065.patch"; url = "https://gitlab.gnome.org/GNOME/fractal/commit/2778acdc6c50bc6f034513029b66b0b092bc4c38.patch";
sha256 = "1qv7ayhkhgrrldag2lzs9ql17nbc1d72j375ljhhf6cms89r19ir"; sha256 = "08v17xmbwrjw688ps4hsnd60d5fm26xj72an3zf6yszha2b97j6y";
}) })
]; ];
postPatch = '' postPatch = ''
patchShebangs scripts/meson_post_install.py chmod +x scripts/test.sh
patchShebangs scripts/meson_post_install.py scripts/test.sh
''; '';
# Don't use buildRustPackage phases, only use it for rust deps setup # Don't use buildRustPackage phases, only use it for rust deps setup