diff options
author | Yurii Rashkovskii <yrashk@gmail.com> | 2018-08-08 14:04:35 +0700 |
---|---|---|
committer | Robin Gloster <mail@glob.in> | 2018-08-22 02:21:00 +0200 |
commit | 61c0adfbc11da6cbc20ec7482ac1b96ae7d1d2a5 (patch) | |
tree | f72bf0c6e89af716143e427d3b40032826632805 | |
parent | 8bb5054494383f70cfd32326e03df7d01941c178 (diff) | |
download | nixlib-61c0adfbc11da6cbc20ec7482ac1b96ae7d1d2a5.tar nixlib-61c0adfbc11da6cbc20ec7482ac1b96ae7d1d2a5.tar.gz nixlib-61c0adfbc11da6cbc20ec7482ac1b96ae7d1d2a5.tar.bz2 nixlib-61c0adfbc11da6cbc20ec7482ac1b96ae7d1d2a5.tar.lz nixlib-61c0adfbc11da6cbc20ec7482ac1b96ae7d1d2a5.tar.xz nixlib-61c0adfbc11da6cbc20ec7482ac1b96ae7d1d2a5.tar.zst nixlib-61c0adfbc11da6cbc20ec7482ac1b96ae7d1d2a5.zip |
astroid: 0.11.1 -> 0.13
Couple of things were updated to make this work. 1. webkitgtk24x-gtk3 that is marked unsafe has been replaced with webkitgtk (2.20.*) as astroid has recently indicated that [>= 2.20 is acceptable](https://github.com/astroidmail/astroid/commit/48ce7e3010d2ee99ccba18798b4f5333867bd1a2) 2. protobuf built input was added to satisfy requirements 3. astroid was not functional at all without proper icons so gnome3.defaultIconTheme were added to buildInputs 4. By default, astroid will use `gvim` as a setting for the embedded editor, however that didn't work well with nixpkgs. vim is now bundled with astroid by default. This setting can be overridden by the user in astroid's config file.
-rw-r--r-- | pkgs/applications/networking/mailreaders/astroid/default.nix | 36 | ||||
-rw-r--r-- | pkgs/applications/networking/mailreaders/astroid/run_tests.diff | 10 |
2 files changed, 39 insertions, 7 deletions
diff --git a/pkgs/applications/networking/mailreaders/astroid/default.nix b/pkgs/applications/networking/mailreaders/astroid/default.nix index 9a348fc03f7a..0cb07b8ce755 100644 --- a/pkgs/applications/networking/mailreaders/astroid/default.nix +++ b/pkgs/applications/networking/mailreaders/astroid/default.nix @@ -1,22 +1,44 @@ -{ stdenv, fetchFromGitHub, cmake, pkgconfig, gnome3, gmime3, webkitgtk24x-gtk3 -, libsass, notmuch, boost, wrapGAppsHook, glib-networking }: +{ stdenv, fetchFromGitHub, cmake, pkgconfig, gnome3, gmime3, webkitgtk +, libsass, notmuch, boost, wrapGAppsHook, glib-networking, protobuf, vim_configurable +, makeWrapper, python3, python3Packages +, vim ? vim_configurable.override { + features = "normal"; + gui = "auto"; + } +}: stdenv.mkDerivation rec { name = "astroid-${version}"; - version = "0.11.1"; + version = "0.13"; src = fetchFromGitHub { owner = "astroidmail"; repo = "astroid"; rev = "v${version}"; - sha256 = "1z48rvlzwi7bq7j55rnb0gg1a4k486yj910z2cxz1p46lxk332j1"; + sha256 = "105x5g44hng3fi03h67j3an53088148jbq8726nmcp0zs0cy9gac"; }; nativeBuildInputs = [ cmake pkgconfig wrapGAppsHook ]; - buildInputs = [ gnome3.gtkmm gmime3 webkitgtk24x-gtk3 libsass gnome3.libpeas - notmuch boost gnome3.gsettings-desktop-schemas - glib-networking ]; + buildInputs = [ gnome3.gtkmm gmime3 webkitgtk libsass gnome3.libpeas + python3 python3Packages.pygobject3 + notmuch boost gnome3.gsettings-desktop-schemas gnome3.defaultIconTheme + glib-networking protobuf ] ++ (if vim == null then [] else [ vim ]); + + patches = [ + # TODO: remove when https://github.com/astroidmail/astroid/pull/531 + # is released + ./run_tests.diff + ]; + + 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 + ''; meta = with stdenv.lib; { homepage = https://astroidmail.github.io/; diff --git a/pkgs/applications/networking/mailreaders/astroid/run_tests.diff b/pkgs/applications/networking/mailreaders/astroid/run_tests.diff new file mode 100644 index 000000000000..21b466741ce1 --- /dev/null +++ b/pkgs/applications/networking/mailreaders/astroid/run_tests.diff @@ -0,0 +1,10 @@ +diff --git a/tests/run_test.sh b/tests/run_test.sh +index f2ea7d7..927c61d 100755 +--- a/tests/run_test.sh ++++ b/tests/run_test.sh +@@ -1,4 +1,4 @@ +-#! /bin/bash ++#! /usr/bin/env bash + # + # Set up environment and run test specified on command line + |