MirrorHub/nixpkgs
0
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-17 23:36:17 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge pull request #24593 from bdimcheff/upgrade-astroid-0.8

Browse source 
astroid: 0.7 -> 0.8
This commit is contained in:
Aristid Breitkreuz 2017-04-08 13:09:02 +02:00 committed by GitHub
commit 9f148e9166
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 {
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/";

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