diff options
author | Graham Christensen <graham@grahamc.com> | 2017-11-15 08:23:32 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-11-15 08:23:32 -0500 |
commit | 44267ed33d5f052b3abc5fcb13f4c3c56f6448e3 (patch) | |
tree | 895bff3248710105f64a6098385788661d6b3d34 /pkgs/desktops/gnome-3 | |
parent | f46003798e3c0ca023b3f0cf44d1f7f5640ba874 (diff) | |
parent | 697a148f45447d28d7dd956ff3d72b088f2a35ec (diff) | |
download | nixlib-44267ed33d5f052b3abc5fcb13f4c3c56f6448e3.tar nixlib-44267ed33d5f052b3abc5fcb13f4c3c56f6448e3.tar.gz nixlib-44267ed33d5f052b3abc5fcb13f4c3c56f6448e3.tar.bz2 nixlib-44267ed33d5f052b3abc5fcb13f4c3c56f6448e3.tar.lz nixlib-44267ed33d5f052b3abc5fcb13f4c3c56f6448e3.tar.xz nixlib-44267ed33d5f052b3abc5fcb13f4c3c56f6448e3.tar.zst nixlib-44267ed33d5f052b3abc5fcb13f4c3c56f6448e3.zip |
Merge pull request #28826 from jtojnar/dleyna
gnome3: Add dleyna service
Diffstat (limited to 'pkgs/desktops/gnome-3')
-rw-r--r-- | pkgs/desktops/gnome-3/apps/gnome-photos/default.nix | 5 | ||||
-rw-r--r-- | pkgs/desktops/gnome-3/core/gnome-online-miners/default.nix | 5 | ||||
-rw-r--r-- | pkgs/desktops/gnome-3/core/grilo-plugins/default.nix | 4 |
3 files changed, 8 insertions, 6 deletions
diff --git a/pkgs/desktops/gnome-3/apps/gnome-photos/default.nix b/pkgs/desktops/gnome-3/apps/gnome-photos/default.nix index 61ec2ac446ce..3c793d703680 100644 --- a/pkgs/desktops/gnome-3/apps/gnome-photos/default.nix +++ b/pkgs/desktops/gnome-3/apps/gnome-photos/default.nix @@ -2,7 +2,8 @@ , pkgconfig, gtk3, glib , makeWrapper, itstool, gegl, babl, lcms2 , desktop_file_utils, gmp, libmediaart, wrapGAppsHook -, gnome3, librsvg, gdk_pixbuf, libexif, gexiv2, geocode_glib }: +, gnome3, librsvg, gdk_pixbuf, libexif, gexiv2, geocode_glib +, dleyna-renderer }: stdenv.mkDerivation rec { inherit (import ./src.nix fetchurl) name src; @@ -18,7 +19,7 @@ stdenv.mkDerivation rec { gnome3.gfbgraph gnome3.grilo-plugins gnome3.grilo gnome3.gnome_online_accounts gnome3.gnome_desktop lcms2 libexif gnome3.tracker libxml2 desktop_file_utils - wrapGAppsHook gexiv2 geocode_glib ]; + wrapGAppsHook gexiv2 geocode_glib dleyna-renderer ]; enableParallelBuilding = true; diff --git a/pkgs/desktops/gnome-3/core/gnome-online-miners/default.nix b/pkgs/desktops/gnome-3/core/gnome-online-miners/default.nix index cb50494bb404..fbcd51b6cc29 100644 --- a/pkgs/desktops/gnome-3/core/gnome-online-miners/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-online-miners/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pkgconfig, glib, gnome3, libxml2 -, libsoup, json_glib, gmp, openssl, makeWrapper }: +, libsoup, json_glib, gmp, openssl, dleyna-server, makeWrapper }: stdenv.mkDerivation rec { inherit (import ./src.nix fetchurl) name src; @@ -8,7 +8,8 @@ stdenv.mkDerivation rec { buildInputs = [ glib gnome3.libgdata libxml2 libsoup gmp openssl gnome3.grilo gnome3.libzapojit gnome3.grilo-plugins gnome3.gnome_online_accounts makeWrapper gnome3.libmediaart - gnome3.tracker gnome3.gfbgraph json_glib gnome3.rest ]; + gnome3.tracker gnome3.gfbgraph json_glib gnome3.rest + dleyna-server ]; enableParallelBuilding = true; diff --git a/pkgs/desktops/gnome-3/core/grilo-plugins/default.nix b/pkgs/desktops/gnome-3/core/grilo-plugins/default.nix index b8911dd5c1f1..eb600770e0ac 100644 --- a/pkgs/desktops/gnome-3/core/grilo-plugins/default.nix +++ b/pkgs/desktops/gnome-3/core/grilo-plugins/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, pkgconfig, file, intltool, glib, sqlite , gnome3, libxml2, gupnp, gssdp, lua5, liboauth, gupnp_av -, gmime, json_glib, avahi, tracker, itstool }: +, gmime, json_glib, avahi, tracker, dleyna-server, itstool }: stdenv.mkDerivation rec { major = "0.3"; @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { buildInputs = [ gnome3.grilo libxml2 gupnp gssdp gnome3.libgdata lua5 liboauth gupnp_av sqlite gnome3.gnome_online_accounts gnome3.totem-pl-parser gnome3.rest gmime json_glib - avahi gnome3.libmediaart tracker intltool itstool ]; + avahi gnome3.libmediaart tracker dleyna-server intltool itstool ]; meta = with stdenv.lib; { homepage = https://wiki.gnome.org/action/show/Projects/Grilo; |