Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: db22815fbd87
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 8f6c65fa045a
Choose a head ref
  • 2 commits
  • 1 file changed
  • 1 contributor

Commits on Jun 28, 2019

  1. fractal: fix build with gstreamer 1.16.0

    @worldofpeace
    worldofpeace committed Jun 28, 2019
    Copy the full SHA
    50b70f8 View commit details

  2. Merge pull request #63906 from worldofpeace/fractal-fixbuild 

    fractal: fix build with gstreamer 1.16.0
    @worldofpeace
    worldofpeace authored Jun 28, 2019

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    8f6c65f View commit details
Showing with 9 additions and 1 deletion.
  1. +9 −1 pkgs/applications/networking/instant-messengers/fractal/default.nix
10 changes: 9 additions & 1 deletion pkgs/applications/networking/instant-messengers/fractal/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{ stdenv, fetchFromGitLab, meson, ninja, gettext, cargo, rustc, python3, rustPlatform, pkgconfig, gtksourceview
, hicolor-icon-theme, glib, libhandy, gtk3, libsecret, dbus, openssl, sqlite, gst_all_1, wrapGAppsHook }:
, hicolor-icon-theme, glib, libhandy, gtk3, libsecret, dbus, openssl, sqlite, gst_all_1, wrapGAppsHook, fetchpatch }:

rustPlatform.buildRustPackage rec {
version = "4.0.0";
@@ -21,6 +21,14 @@ rustPlatform.buildRustPackage rec {
gtksourceview hicolor-icon-theme libsecret
];

patches = [
# Fixes build with >= gstreamer 1.15.1
(fetchpatch {
url = "https://gitlab.gnome.org/GNOME/fractal/commit/e78f36c25c095ea09c9c421187593706ad7c4065.patch";
sha256 = "1qv7ayhkhgrrldag2lzs9ql17nbc1d72j375ljhhf6cms89r19ir";
})
];

postPatch = ''
patchShebangs scripts/meson_post_install.py
'';