diff options
| author | Brandon Dimcheff <bdimchef-git@wieldim.com> | 2017-04-02 23:37:24 -0400 |
|---|---|---|
| committer | Brandon Dimcheff <bdimchef-git@wieldim.com> | 2017-04-02 23:37:24 -0400 |
| commit | aac3f9a8cb3367dd2d204850951b0493f72ac070 (patch) | |
| tree | 2692dd3431d01ee3911a42f8bde41675676018c0 /pkgs/applications/networking/mailreaders/astroid | |
| parent | a77571399d71167bf16b4183090a6f7e203d7e0f (diff) | |
astroid: 0.7 -> 0.8
Upgraded astroid to 0.8 and uses the upstream changes to properly
propagate environment without a patch. Note that this still uses an
unsupported version of webkitgtk and thus will fail to build, but if
allow webkitgtk to install, astroid will run.
Diffstat (limited to 'pkgs/applications/networking/mailreaders/astroid')
| -rw-r--r-- | pkgs/applications/networking/mailreaders/astroid/default.nix | 10 | ||||
| -rw-r--r-- | pkgs/applications/networking/mailreaders/astroid/propagate-environment.patch | 13 |
2 files changed, 4 insertions, 19 deletions
diff --git a/pkgs/applications/networking/mailreaders/astroid/default.nix b/pkgs/applications/networking/mailreaders/astroid/default.nix index 96b1b7d285e..668044f5efb 100644 --- a/pkgs/applications/networking/mailreaders/astroid/default.nix +++ b/pkgs/applications/networking/mailreaders/astroid/default.nix @@ -3,25 +3,23 @@ stdenv.mkDerivation rec { name = "astroid-${version}"; - version = "0.7"; + version = "0.8"; src = fetchFromGitHub { owner = "astroidmail"; repo = "astroid"; rev = "v${version}"; - sha256 = "0r3hqwwr68bjhqaa1r3l9brbmvdp11pf8vhsjlvm5zv520z5y1rf"; + sha256 = "1gjrdls1mz8y8bca7s8l965l0m7s2sb6g7a90gy848admjsyav7h"; }; - patches = [ ./propagate-environment.patch ]; - 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"; + buildPhase = "scons --propagate-environment --prefix=$out build"; + installPhase = "scons --propagate-environment --prefix=$out install"; meta = { homepage = "https://astroidmail.github.io/"; diff --git a/pkgs/applications/networking/mailreaders/astroid/propagate-environment.patch b/pkgs/applications/networking/mailreaders/astroid/propagate-environment.patch deleted file mode 100644 index db536ea721f..00000000000 --- a/pkgs/applications/networking/mailreaders/astroid/propagate-environment.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/SConstruct b/SConstruct -index a80bca3..ed2cd6d 100644 ---- a/SConstruct -+++ b/SConstruct -@@ -5,7 +5,7 @@ from subprocess import * - def getGitDesc(): - return Popen('git describe --abbrev=8 --tags --always', stdout=PIPE, shell=True).stdout.read ().strip () - --env = Environment () -+env = Environment(ENV = os.environ) - - AddOption ("--release", action="store", dest="release", default="git", help="Make a release (default: git describe output)") - AddOption ("--enable-debug", action="store", dest="debug", default=None, help="Enable the -g flag for debugging (default: true when release is git)") |