astroid: 0.6 -> 0.7, use wrapGAppsHook

cc @bdimcheff #22559

+8 -11
+8 -11
pkgs/applications/networking/mailreaders/astroid/default.nix
··· 1 1 { stdenv, fetchFromGitHub, scons, pkgconfig, gnome3, gmime, webkitgtk24x 2 - , libsass, notmuch, boost, makeWrapper }: 2 + , libsass, notmuch, boost, wrapGAppsHook }: 3 3 4 4 stdenv.mkDerivation rec { 5 5 name = "astroid-${version}"; 6 - version = "0.6"; 6 + version = "0.7"; 7 7 8 8 src = fetchFromGitHub { 9 9 owner = "astroidmail"; 10 10 repo = "astroid"; 11 11 rev = "v${version}"; 12 - sha256 = "0zashjmqv8ips9q8ckyhgm9hfyf01wpgs6g21cwl05q5iklc5x7r"; 12 + sha256 = "0r3hqwwr68bjhqaa1r3l9brbmvdp11pf8vhsjlvm5zv520z5y1rf"; 13 13 }; 14 14 15 15 patches = [ ./propagate-environment.patch ]; 16 16 17 - buildInputs = [ scons pkgconfig gnome3.gtkmm gmime webkitgtk24x libsass 18 - gnome3.libpeas notmuch boost gnome3.gsettings_desktop_schemas 19 - makeWrapper ]; 17 + nativeBuildInputs = [ scons pkgconfig wrapGAppsHook ]; 18 + 19 + buildInputs = [ gnome3.gtkmm gmime webkitgtk24x libsass gnome3.libpeas 20 + notmuch boost gnome3.gsettings_desktop_schemas 21 + gnome3.adwaita-icon-theme ]; 20 22 21 23 buildPhase = "scons --prefix=$out build"; 22 24 installPhase = "scons --prefix=$out install"; 23 - 24 - preFixup = '' 25 - wrapProgram "$out/bin/astroid" \ 26 - --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH:${gnome3.adwaita-icon-theme}/share" 27 - ''; 28 25 29 26 meta = { 30 27 homepage = "https://astroidmail.github.io/";