Merge branch 'nixpkgs-update' into master

1 files changed, 23 insertions, 15 deletions

diff --git a/pkgs/applications/networking/mailreaders/astroid/default.nix b/pkgs/applications/networking/mailreaders/astroid/default.nix
index 171136ce22c..4401a0a7df8 100644
--- a/pkgs/applications/networking/mailreaders/astroid/default.nix
+++ b/pkgs/applications/networking/mailreaders/astroid/default.nix
@@ -1,12 +1,12 @@
-{ stdenv, fetchFromGitHub, cmake, pkgconfig, gnome3, gmime3, webkitgtk
+{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, gnome, gmime3, webkitgtk, ronn
 , libsass, notmuch, boost, wrapGAppsHook, glib-networking, protobuf, vim_configurable
-, gtkmm3, libpeas, gsettings-desktop-schemas
-, python3, python3Packages
-, vim ? vim_configurable.override {
-                    features = "normal";
-                    gui = "auto";
-                  }
-, ronn
+, gtkmm3, libpeas, gsettings-desktop-schemas, gobject-introspection, python3
+
+# vim to be used, should support the GUI mode.
+, vim ? vim_configurable.override { features = "normal"; gui = "auto"; }
+
+# additional python3 packages to be available within plugins
+, extraPythonPackages ? []
 }:
 
 stdenv.mkDerivation rec {
@@ -20,25 +20,33 @@ stdenv.mkDerivation rec {
     sha256 = "11cxbva9ni98gii59xmbxh4c6idcg3mg0pgdsp1c3j0yg7ix0lj3";
   };
 
-  nativeBuildInputs = [ cmake ronn pkgconfig wrapGAppsHook ];
+  nativeBuildInputs = [
+    cmake ronn pkg-config wrapGAppsHook gobject-introspection
+    python3 python3.pkgs.wrapPython
+  ];
 
   buildInputs = [
     gtkmm3 gmime3 webkitgtk libsass libpeas
-    python3 python3Packages.pygobject3
-    notmuch boost gsettings-desktop-schemas gnome3.adwaita-icon-theme
+    python3
+    notmuch boost gsettings-desktop-schemas gnome.adwaita-icon-theme
     glib-networking protobuf
-   ] ++ (if vim == null then [] else [ vim ]);
+    vim
+  ];
 
   postPatch = ''
     sed -i "s~gvim ~${vim}/bin/vim -g ~g" src/config.cc
     sed -i "s~ -geom 10x10~~g" src/config.cc
   '';
 
-  postInstall = ''
-    wrapProgram "$out/bin/astroid" --set CHARSET=en_us.UTF-8
+  pythonPath = with python3.pkgs; requiredPythonModules [ pygobject3 ] ++ extraPythonPackages;
+  preFixup = ''
+    buildPythonPath "$out $pythonPath"
+    gappsWrapperArgs+=(
+      --prefix PYTHONPATH : "$program_PYTHONPATH"
+    )
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://astroidmail.github.io/";
     description = "GTK frontend to the notmuch mail system";
     maintainers = with maintainers; [ bdimcheff SuprDewd ];