From 92d2d74c4040a26c3a72e577c53f6e76e1198646 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Thu, 9 Feb 2017 14:44:04 +0100
Subject: [PATCH] astroid: 0.6 -> 0.7, use wrapGAppsHook

cc @bdimcheff #22559
---
 .../mailreaders/astroid/default.nix           | 19 ++++++++-----------
 1 file changed, 8 insertions(+), 11 deletions(-)

diff --git a/pkgs/applications/networking/mailreaders/astroid/default.nix b/pkgs/applications/networking/mailreaders/astroid/default.nix
index 173bb81fbbe5..96b1b7d285eb 100644
--- a/pkgs/applications/networking/mailreaders/astroid/default.nix
+++ b/pkgs/applications/networking/mailreaders/astroid/default.nix
@@ -1,31 +1,28 @@
 { stdenv, fetchFromGitHub, scons, pkgconfig, gnome3, gmime, webkitgtk24x
-  , libsass, notmuch, boost, makeWrapper }:
+, libsass, notmuch, boost, wrapGAppsHook }:
 
 stdenv.mkDerivation rec {
   name = "astroid-${version}";
-  version = "0.6";
+  version = "0.7";
 
   src = fetchFromGitHub {
     owner = "astroidmail";
     repo = "astroid";
     rev = "v${version}";
-    sha256 = "0zashjmqv8ips9q8ckyhgm9hfyf01wpgs6g21cwl05q5iklc5x7r";
+    sha256 = "0r3hqwwr68bjhqaa1r3l9brbmvdp11pf8vhsjlvm5zv520z5y1rf";
   };
 
   patches = [ ./propagate-environment.patch ];
 
-  buildInputs = [ scons pkgconfig gnome3.gtkmm gmime webkitgtk24x libsass
-                  gnome3.libpeas notmuch boost gnome3.gsettings_desktop_schemas
-                  makeWrapper ];
+  nativeBuildInputs = [ scons pkgconfig wrapGAppsHook ];
+
+  buildInputs = [ gnome3.gtkmm gmime webkitgtk24x libsass gnome3.libpeas
+                  notmuch boost gnome3.gsettings_desktop_schemas
+                  gnome3.adwaita-icon-theme ];
 
   buildPhase = "scons --prefix=$out build";
   installPhase = "scons --prefix=$out install";
 
-  preFixup = ''
-    wrapProgram "$out/bin/astroid" \
-      --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH:${gnome3.adwaita-icon-theme}/share"
-  '';
-
   meta = {
     homepage = "https://astroidmail.github.io/";
     description = "GTK+ frontend to the notmuch mail system";