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: 5aa46b6bdb5f
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 0dc92e096d12
Choose a head ref
  • 1 commit
  • 1 file changed
  • 1 contributor

Commits on Oct 4, 2019

  1. libmediaart: apply patch to fix gnome-music crash 

    See https://bugzilla.gnome.org/show_bug.cgi?id=792272

(cherry picked from commit 85b7d89)
    @worldofpeace
    worldofpeace committed Oct 4, 2019

    Verified

    This commit was signed with the committer’s verified signature.
    tadeokondrak Tadeo Kondrak
    GPG key ID: D41E092CA43F1D8B
    Verified
    Learn about vigilant mode
    Copy the full SHA
    0dc92e0 View commit details
Showing with 9 additions and 1 deletion.
  1. +9 −1 pkgs/development/libraries/libmediaart/default.nix
10 changes: 9 additions & 1 deletion pkgs/development/libraries/libmediaart/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{ stdenv, fetchurl, meson, ninja, pkgconfig, vala, gtk-doc, docbook_xsl, docbook_xml_dtd_412, glib, gdk-pixbuf, gobject-introspection, gnome3 }:
{ stdenv, fetchurl, meson, ninja, pkgconfig, vala, gtk-doc, docbook_xsl, docbook_xml_dtd_412, glib, gdk-pixbuf, gobject-introspection, gnome3, fetchpatch }:

stdenv.mkDerivation rec {
pname = "libmediaart";
@@ -14,6 +14,14 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ meson ninja pkgconfig vala gtk-doc docbook_xsl docbook_xml_dtd_412 gobject-introspection ];
buildInputs = [ glib gdk-pixbuf ];

patches = [
# https://bugzilla.gnome.org/show_bug.cgi?id=792272
(fetchpatch {
url = "https://gitlab.gnome.org/GNOME/libmediaart/commit/a704d0b6cfea091274bd79aca6d15f19b4f6e5b5.patch";
sha256 = "0606qfmdqxcxrydv1fgwq11hmas34ba4a5kzbbqdhfh0h9ldgwkv";
})
];

# FIXME: Turn on again when https://github.com/NixOS/nixpkgs/issues/53701
# is fixed on master.
doCheck = false;