diff options
author | Robin Gloster <mail@glob.in> | 2016-08-12 09:46:53 +0000 |
---|---|---|
committer | Robin Gloster <mail@glob.in> | 2016-08-12 09:46:53 +0000 |
commit | b7787d932ec9cbd82ea6bc7c69d8df159b606fdc (patch) | |
tree | c4b6af2e6b49732ce5c6982cb8512ce9b7f1f34d /pkgs/desktops/gnome-3/3.20/core | |
parent | bc025e83bd6c44df38851ef23da53359a0e62841 (diff) | |
parent | 532b2222965377e77ed884c463ee2751fb51dba3 (diff) | |
download | nixlib-b7787d932ec9cbd82ea6bc7c69d8df159b606fdc.tar nixlib-b7787d932ec9cbd82ea6bc7c69d8df159b606fdc.tar.gz nixlib-b7787d932ec9cbd82ea6bc7c69d8df159b606fdc.tar.bz2 nixlib-b7787d932ec9cbd82ea6bc7c69d8df159b606fdc.tar.lz nixlib-b7787d932ec9cbd82ea6bc7c69d8df159b606fdc.tar.xz nixlib-b7787d932ec9cbd82ea6bc7c69d8df159b606fdc.tar.zst nixlib-b7787d932ec9cbd82ea6bc7c69d8df159b606fdc.zip |
Merge remote-tracking branch 'upstream/master' into hardened-stdenv
Diffstat (limited to 'pkgs/desktops/gnome-3/3.20/core')
3 files changed, 46 insertions, 5 deletions
diff --git a/pkgs/desktops/gnome-3/3.20/core/gtksourceviewmm/default.nix b/pkgs/desktops/gnome-3/3.20/core/gtksourceviewmm/default.nix new file mode 100644 index 000000000000..d0453ba8ebbf --- /dev/null +++ b/pkgs/desktops/gnome-3/3.20/core/gtksourceviewmm/default.nix @@ -0,0 +1,16 @@ +{ stdenv, fetchurl, pkgconfig, gtkmm, glibmm, gtksourceview }: + +stdenv.mkDerivation rec { + inherit (import ./src.nix fetchurl) name src; + + buildInputs = [ pkgconfig glibmm gtkmm gtksourceview ]; + + meta = with stdenv.lib; { + platforms = platforms.linux; + homepage = "https://developer.gnome.org/gtksourceviewmm/"; + description = "C++ wrapper for gtksourceview"; + license = licenses.lgpl2; + maintainers = [ maintainers.juliendehos ]; + }; +} + diff --git a/pkgs/desktops/gnome-3/3.20/core/gtksourceviewmm/src.nix b/pkgs/desktops/gnome-3/3.20/core/gtksourceviewmm/src.nix new file mode 100644 index 000000000000..21fecfdc48af --- /dev/null +++ b/pkgs/desktops/gnome-3/3.20/core/gtksourceviewmm/src.nix @@ -0,0 +1,11 @@ +# Autogenerated by maintainers/scripts/gnome.sh update + +fetchurl: { + name = "gtksourceviewmm-3.18.0"; + + src = fetchurl { + url = mirror://gnome/sources/gtksourceviewmm/3.18/gtksourceviewmm-3.18.0.tar.xz; + sha256 = "51081ae3d37975dae33d3f6a40621d85cb68f4b36ae3835eec1513482aacfb39"; + }; +} + diff --git a/pkgs/desktops/gnome-3/3.20/core/vino/default.nix b/pkgs/desktops/gnome-3/3.20/core/vino/default.nix index 336178f3729d..524813957563 100644 --- a/pkgs/desktops/gnome-3/3.20/core/vino/default.nix +++ b/pkgs/desktops/gnome-3/3.20/core/vino/default.nix @@ -1,14 +1,28 @@ -{ stdenv, intltool, fetchurl, gtk3, glib, libsoup, pkgconfig, makeWrapper -, gnome3, libnotify, file, telepathy_glib, dbus_glib }: +{ stdenv, fetchurl, lib, makeWrapper +, pkgconfig, gnome3, gtk3, glib, intltool, libXtst, libnotify, libsoup +, telepathySupport ? false, dbus_glib ? null, telepathy_glib ? null +, libsecret ? null, gnutls ? null, libgcrypt ? null, avahi ? null +, zlib ? null, libjpeg ? null +, libXdamage ? null, libXfixes ? null, libXext ? null +, gnomeKeyringSupport ? false, libgnome_keyring3 ? null +, networkmanager ? null }: + +with lib; stdenv.mkDerivation rec { inherit (import ./src.nix fetchurl) name src; doCheck = true; - buildInputs = [ gtk3 intltool glib libsoup pkgconfig libnotify - gnome3.defaultIconTheme dbus_glib telepathy_glib file - makeWrapper ]; + buildInputs = [ + makeWrapper + pkgconfig gnome3.defaultIconTheme gtk3 glib intltool libXtst libnotify libsoup + ] ++ optionals telepathySupport [ dbus_glib telepathy_glib ] + ++ optional gnomeKeyringSupport libgnome_keyring3 + ++ filter (p: p != null) [ + libsecret gnutls libgcrypt avahi zlib libjpeg + libXdamage libXfixes libXext networkmanager + ]; preFixup = '' wrapProgram "$out/libexec/vino-server" \ |