From 79ccc481693ddff09577009938b32750fffed473 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Mon, 28 Oct 2019 02:31:37 +0100 Subject: [PATCH 1/7] telepathy-mission-control: format with nixpkgs-format --- .../telepathy/mission-control/default.nix | 24 +++++++++++++++---- 1 file changed, 19 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/telepathy/mission-control/default.nix b/pkgs/applications/networking/instant-messengers/telepathy/mission-control/default.nix index 7d68f66afc79..b94b1c4d6f4e 100644 --- a/pkgs/applications/networking/instant-messengers/telepathy/mission-control/default.nix +++ b/pkgs/applications/networking/instant-messengers/telepathy/mission-control/default.nix @@ -1,17 +1,31 @@ -{ stdenv, fetchurl, pkgconfig, gnome3, telepathy-glib, libxslt, makeWrapper }: +{ stdenv +, fetchurl +, pkgconfig +, gnome3 +, telepathy-glib +, libxslt +, makeWrapper +}: stdenv.mkDerivation rec { - name = "${pname}-5.16.4"; pname = "telepathy-mission-control"; + version = "5.16.4"; src = fetchurl { - url = "https://telepathy.freedesktop.org/releases/${pname}/${name}.tar.gz"; + url = "https://telepathy.freedesktop.org/releases/${pname}/${pname}-${version}.tar.gz"; sha256 = "1jz6wwgsfxixha6ys2hbzbk5faqnj9kh2m5qdlgx5anqgandsscp"; }; - buildInputs = [ telepathy-glib telepathy-glib.python ]; # ToDo: optional stuff missing + buildInputs = [ + telepathy-glib + telepathy-glib.python + ]; # ToDo: optional stuff missing - nativeBuildInputs = [ pkgconfig libxslt makeWrapper ]; + nativeBuildInputs = [ + pkgconfig + libxslt + makeWrapper + ]; doCheck = true; From 478744612f8293d9fdc73f432fa76ac8a7a058f8 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Mon, 28 Oct 2019 02:34:38 +0100 Subject: [PATCH 2/7] =?UTF-8?q?telepathy-mission-control:=205.16.4=20?= =?UTF-8?q?=E2=86=92=205.16.5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://github.com/TelepathyIM/telepathy-mission-control/blob/telepathy-mission-control-5.16.5/NEWS#L1-L15 --- .../telepathy/mission-control/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/telepathy/mission-control/default.nix b/pkgs/applications/networking/instant-messengers/telepathy/mission-control/default.nix index b94b1c4d6f4e..6d82f86b7519 100644 --- a/pkgs/applications/networking/instant-messengers/telepathy/mission-control/default.nix +++ b/pkgs/applications/networking/instant-messengers/telepathy/mission-control/default.nix @@ -3,22 +3,23 @@ , pkgconfig , gnome3 , telepathy-glib +, python3 , libxslt , makeWrapper }: stdenv.mkDerivation rec { pname = "telepathy-mission-control"; - version = "5.16.4"; + version = "5.16.5"; src = fetchurl { url = "https://telepathy.freedesktop.org/releases/${pname}/${pname}-${version}.tar.gz"; - sha256 = "1jz6wwgsfxixha6ys2hbzbk5faqnj9kh2m5qdlgx5anqgandsscp"; + sha256 = "00xxv38cfdirnfvgyd56m60j0nkmsv5fz6p2ydyzsychicxl6ssc"; }; buildInputs = [ telepathy-glib - telepathy-glib.python + python3 ]; # ToDo: optional stuff missing nativeBuildInputs = [ From 3949c5bfd7f719bfa24c22fe8a9096b1cf1aab2f Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Tue, 29 Oct 2019 00:25:26 +0100 Subject: [PATCH 3/7] telepathy-mission-control: propagate required dependencies --- .../instant-messengers/telepathy/mission-control/default.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/networking/instant-messengers/telepathy/mission-control/default.nix b/pkgs/applications/networking/instant-messengers/telepathy/mission-control/default.nix index 6d82f86b7519..b99d0c2a1661 100644 --- a/pkgs/applications/networking/instant-messengers/telepathy/mission-control/default.nix +++ b/pkgs/applications/networking/instant-messengers/telepathy/mission-control/default.nix @@ -18,7 +18,6 @@ stdenv.mkDerivation rec { }; buildInputs = [ - telepathy-glib python3 ]; # ToDo: optional stuff missing @@ -28,6 +27,10 @@ stdenv.mkDerivation rec { makeWrapper ]; + propagatedBuildInputs = [ + telepathy-glib + ]; + doCheck = true; preFixup = '' From 54fc43c248bf93a3cfd858a344a9e1a9d06bddad Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Tue, 29 Oct 2019 00:53:11 +0100 Subject: [PATCH 4/7] telepathy-mission-control: split outputs and enable parallel building --- .../telepathy/mission-control/default.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/networking/instant-messengers/telepathy/mission-control/default.nix b/pkgs/applications/networking/instant-messengers/telepathy/mission-control/default.nix index b99d0c2a1661..6bbe82c4a28e 100644 --- a/pkgs/applications/networking/instant-messengers/telepathy/mission-control/default.nix +++ b/pkgs/applications/networking/instant-messengers/telepathy/mission-control/default.nix @@ -12,6 +12,8 @@ stdenv.mkDerivation rec { pname = "telepathy-mission-control"; version = "5.16.5"; + outputs = [ "out" "lib" "dev" ]; + src = fetchurl { url = "https://telepathy.freedesktop.org/releases/${pname}/${pname}-${version}.tar.gz"; sha256 = "00xxv38cfdirnfvgyd56m60j0nkmsv5fz6p2ydyzsychicxl6ssc"; @@ -33,8 +35,10 @@ stdenv.mkDerivation rec { doCheck = true; + enableParallelBuilding = true; + preFixup = '' - wrapProgram "$out/libexec/mission-control-5" \ + wrapProgram "$lib/libexec/mission-control-5" \ --prefix GIO_EXTRA_MODULES : "${stdenv.lib.getLib gnome3.dconf}/lib/gio/modules" \ --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH" ''; From e4946cf0509eea08a4e694fd9c0815048990c01c Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Tue, 29 Oct 2019 00:53:39 +0100 Subject: [PATCH 5/7] empathy: enable parallel building --- pkgs/desktops/gnome-3/core/empathy/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/desktops/gnome-3/core/empathy/default.nix b/pkgs/desktops/gnome-3/core/empathy/default.nix index 5e4bbf8cce17..6c45802a7754 100644 --- a/pkgs/desktops/gnome-3/core/empathy/default.nix +++ b/pkgs/desktops/gnome-3/core/empathy/default.nix @@ -45,6 +45,8 @@ stdenv.mkDerivation rec { cheese libgudev ]; + enableParallelBuilding = true; + LC_ALL = "en_US.UTF-8"; passthru = { From 59b226350a8e01069d4875325acc8d7cab9513cf Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Tue, 29 Oct 2019 00:55:17 +0100 Subject: [PATCH 6/7] empathy: format with nixpgks-format --- .../desktops/gnome-3/core/empathy/default.nix | 132 ++++++++++++++---- 1 file changed, 108 insertions(+), 24 deletions(-) diff --git a/pkgs/desktops/gnome-3/core/empathy/default.nix b/pkgs/desktops/gnome-3/core/empathy/default.nix index 6c45802a7754..148c0381ddc3 100644 --- a/pkgs/desktops/gnome-3/core/empathy/default.nix +++ b/pkgs/desktops/gnome-3/core/empathy/default.nix @@ -1,13 +1,55 @@ -{ stdenv, intltool, fetchurl, webkitgtk, pkgconfig, gtk3, glib -, file, librsvg, gnome3, gdk-pixbuf, python3 -, telepathy-glib, telepathy-farstream, glibcLocales -, clutter-gtk, clutter-gst, gst_all_1, cogl, gnome-online-accounts -, gcr, libsecret, folks, libpulseaudio, telepathy-mission-control -, telepathy-logger, libnotify, clutter, libsoup, gnutls -, evolution-data-server, yelp-xsl -, libcanberra-gtk3, p11-kit, farstream, libtool, shared-mime-info -, wrapGAppsHook, itstool, libxml2, libxslt, icu, libgee, gsettings-desktop-schemas -, isocodes, enchant, libchamplain, geoclue2, geocode-glib, cheese, libgudev }: +{ stdenv +, intltool +, fetchurl +, webkitgtk +, pkgconfig +, gtk3 +, glib +, file +, librsvg +, gnome3 +, gdk-pixbuf +, python3 +, telepathy-glib +, telepathy-farstream +, glibcLocales +, clutter-gtk +, clutter-gst +, gst_all_1 +, cogl +, gnome-online-accounts +, gcr +, libsecret +, folks +, libpulseaudio +, telepathy-mission-control +, telepathy-logger +, libnotify +, clutter +, libsoup +, gnutls +, evolution-data-server +, yelp-xsl +, libcanberra-gtk3 +, p11-kit +, farstream +, libtool +, shared-mime-info +, wrapGAppsHook +, itstool +, libxml2 +, libxslt +, icu +, libgee +, gsettings-desktop-schemas +, isocodes +, enchant +, libchamplain +, geoclue2 +, geocode-glib +, cheese +, libgudev +}: stdenv.mkDerivation rec { pname = "empathy"; @@ -19,30 +61,72 @@ stdenv.mkDerivation rec { }; propagatedUserEnvPkgs = [ - gnome-online-accounts shared-mime-info + gnome-online-accounts + shared-mime-info ]; + propagatedBuildInputs = [ - folks telepathy-logger evolution-data-server telepathy-mission-control + folks + telepathy-logger + evolution-data-server + telepathy-mission-control ]; + nativeBuildInputs = [ - pkgconfig libtool intltool itstool file wrapGAppsHook - libxml2 libxslt yelp-xsl python3 glibcLocales + pkgconfig + libtool + intltool + itstool + file + wrapGAppsHook + libxml2 + libxslt + yelp-xsl + python3 + glibcLocales ]; + buildInputs = [ - gtk3 glib webkitgtk icu gnome-online-accounts - telepathy-glib clutter-gtk clutter-gst cogl - gst_all_1.gstreamer gst_all_1.gst-plugins-base - gcr libsecret libpulseaudio gdk-pixbuf - libnotify clutter libsoup gnutls libgee p11-kit - libcanberra-gtk3 telepathy-farstream farstream - gnome3.adwaita-icon-theme gsettings-desktop-schemas + gtk3 + glib + webkitgtk + icu + gnome-online-accounts + telepathy-glib + clutter-gtk + clutter-gst + cogl + gst_all_1.gstreamer + gst_all_1.gst-plugins-base + gcr + libsecret + libpulseaudio + gdk-pixbuf + libnotify + clutter + libsoup + gnutls + libgee + p11-kit + libcanberra-gtk3 + telepathy-farstream + farstream + gnome3.adwaita-icon-theme + gsettings-desktop-schemas librsvg + # Spell-checking - enchant isocodes + enchant + isocodes + # Display maps, location awareness, geocode support - libchamplain geoclue2 geocode-glib + libchamplain + geoclue2 + geocode-glib + # Cheese webcam support, camera monitoring - cheese libgudev + cheese + libgudev ]; enableParallelBuilding = true; From f3f73844bc796b12f6b160826ad047ea1e6ed9c3 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Tue, 29 Oct 2019 01:39:14 +0100 Subject: [PATCH 7/7] empathy: clean up slightly --- pkgs/desktops/gnome-3/core/empathy/default.nix | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/pkgs/desktops/gnome-3/core/empathy/default.nix b/pkgs/desktops/gnome-3/core/empathy/default.nix index 148c0381ddc3..067772524622 100644 --- a/pkgs/desktops/gnome-3/core/empathy/default.nix +++ b/pkgs/desktops/gnome-3/core/empathy/default.nix @@ -12,7 +12,6 @@ , python3 , telepathy-glib , telepathy-farstream -, glibcLocales , clutter-gtk , clutter-gst , gst_all_1 @@ -60,11 +59,6 @@ stdenv.mkDerivation rec { sha256 = "0sn10fcymc6lyrabk7vx8lpvlaxxkqnmcwj9zdkfa8qf3388k4nc"; }; - propagatedUserEnvPkgs = [ - gnome-online-accounts - shared-mime-info - ]; - propagatedBuildInputs = [ folks telepathy-logger @@ -83,7 +77,6 @@ stdenv.mkDerivation rec { libxslt yelp-xsl python3 - glibcLocales ]; buildInputs = [ @@ -131,7 +124,11 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - LC_ALL = "en_US.UTF-8"; + preFixup = '' + gappsWrapperArgs+=( + --prefix XDG_DATA_DIRS : "${shared-mime-info}/share" + ) + ''; passthru = { updateScript = gnome3.updateScript {