Unverified Commit 1dac9895 authored by maxine's avatar maxine Committed by GitHub
Browse files

Merge pull request #226880 from bobby285271/upd/rhythmbox

parents 1e1a6dc8 abf61df2

pkgs/applications/audio/rhythmbox/default.nix

+5 −4
Original line number Diff line number Diff line
@@ -10,7 +10,7 @@ 
, glib

, gtk3

, libpeas

, libsoup

, libsoup_3

, libxml2

, libsecret

, libnotify
@@ -36,11 +36,11 @@ 


stdenv.mkDerivation rec {

  pname = "rhythmbox";

  version = "3.4.6";

  version = "3.4.7";



  src = fetchurl {

    url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";

    sha256 = "+VaCEM5V5BHpKcj7leERohHb0ZzEf1ePKRxdMZtesDQ=";

    sha256 = "L21WwT/BpkxTT1AHiPtIKTbOVHs0PtkMZ94fK84M+n4=";

  };



  nativeBuildInputs = [
@@ -56,7 +56,7 @@ stdenv.mkDerivation rec { 


  buildInputs = [

    python3

    libsoup

    libsoup_3

    libxml2

    tdb

    json-glib
@@ -92,6 +92,7 @@ stdenv.mkDerivation rec { 
  ];



  mesonFlags = [

    "-Ddaap=enabled"

    "-Dtests=disabled"

  ];

pkgs/development/libraries/grilo-plugins/default.nix

+2 −0
Original line number Diff line number Diff line
@@ -8,6 +8,7 @@ 
, gperf

, sqlite

, libarchive

, libdmapsharing

, libsoup_3

, gnome

, libxml2
@@ -71,6 +72,7 @@ stdenv.mkDerivation rec { 
    gnome-online-accounts

    totem-pl-parser

    libarchive

    libdmapsharing

    libsoup_3

    gmime

    gom

pkgs/development/libraries/libdmapsharing/default.nix

+5 −21
Original line number Diff line number Diff line
@@ -12,19 +12,16 @@ 
, gdk-pixbuf

, gst_all_1

, glib

, gtk3

, libgee

, check

, gtk-doc

, docbook-xsl-nons

, docbook_xml_dtd_43

, gobject-introspection

, libsoup

, libsoup_3

}:



stdenv.mkDerivation rec {

  pname = "libdmapsharing";

  version = "3.9.10";

  version = "3.9.12";



  outputs = [ "out" "dev" "devdoc" ];

  outputBin = "dev";
@@ -34,7 +31,7 @@ stdenv.mkDerivation rec { 
    owner = "GNOME";

    repo = pname;

    rev = "${lib.toUpper pname}_${lib.replaceStrings ["."] ["_"] version}";

    sha256 = "04y1wjwnbw4pzg05h383d83p6an6ylwy4b4g32jmjxpfi388x33g";

    sha256 = "tnQ25RR/bAZJKa8vTwzkGK1iPc7CMGFbyX8mBf6TKr4=";

  };



  nativeBuildInputs = [
@@ -60,31 +57,18 @@ stdenv.mkDerivation rec { 


  propagatedBuildInputs = [

    glib

    libsoup

  ];



  nativeCheckInputs = [

    libgee

    check

    gtk3

    libsoup_3

  ];



  configureFlags = [

    "--enable-gtk-doc"

    "--disable-tests" # Tests require mDNS server.

  ];



  # Cannot disable tests here or `check` from nativeCheckInputs would not be included.

  # Cannot disable building the tests or docs will not build:

  # https://gitlab.gnome.org/GNOME/libdmapsharing/-/issues/49

  doCheck = true;



  preConfigure = ''

    NOCONFIGURE=1 ./autogen.sh

  '';



  # Tests require mDNS server.

  checkPhase = ":";



  meta = with lib; {

    homepage = "https://www.flyn.org/projects/libdmapsharing/";

    description = "Library that implements the DMAP family of protocols";