public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

astroid: 0.7 -> 0.8

Browse Source 
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.
This commit is contained in:
Brandon Dimcheff 2017-04-02 23:37:24 -04:00
parent a77571399d
commit aac3f9a8cb
2 changed files with 4 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pkgs/applications/networking/mailreaders/astroid/default.nix
View File

@ -3,25 +3,23 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "astroid-${version}"; name = "astroid-${version}";
version = "0.7"; version = "0.8";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "astroidmail"; owner = "astroidmail";
repo = "astroid"; repo = "astroid";
rev = "v${version}"; rev = "v${version}";
sha256 = "0r3hqwwr68bjhqaa1r3l9brbmvdp11pf8vhsjlvm5zv520z5y1rf"; sha256 = "1gjrdls1mz8y8bca7s8l965l0m7s2sb6g7a90gy848admjsyav7h";
}; };
patches = [ ./propagate-environment.patch ];
nativeBuildInputs = [ scons pkgconfig wrapGAppsHook ]; nativeBuildInputs = [ scons pkgconfig wrapGAppsHook ];
buildInputs = [ gnome3.gtkmm gmime webkitgtk24x libsass gnome3.libpeas buildInputs = [ gnome3.gtkmm gmime webkitgtk24x libsass gnome3.libpeas
notmuch boost gnome3.gsettings_desktop_schemas notmuch boost gnome3.gsettings_desktop_schemas
gnome3.adwaita-icon-theme ]; gnome3.adwaita-icon-theme ];
buildPhase = "scons --prefix=$out build"; buildPhase = "scons --propagate-environment --prefix=$out build";
installPhase = "scons --prefix=$out install"; installPhase = "scons --propagate-environment --prefix=$out install";
meta = { meta = {
homepage = "https://astroidmail.github.io/"; homepage = "https://astroidmail.github.io/";

13
pkgs/applications/networking/mailreaders/astroid/propagate-environment.patch
View File

@ -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)")