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

Merge remote-tracking branch 'origin/master' into multiple-outputs

Browse Source 
Conflicts:
	pkgs/development/libraries/atk/default.nix
	pkgs/development/libraries/cairo/default.nix
	pkgs/development/libraries/freetype/default.nix
	pkgs/development/libraries/glib/default.nix
	pkgs/development/libraries/gmime/default.nix
	pkgs/development/libraries/pango/default.nix
	pkgs/servers/x11/xorg/default.nix
	pkgs/top-level/all-packages.nix
This commit is contained in:
Eelco Dolstra
2013-06-25 18:42:56 +02:00
parent cc61d31902 9dc3599960
commit 552fd3d599
438 changed files with 11405 additions and 3550 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/development/libraries/gmime/default.nix
+9 -6
View File
@@ -1,16 +1,19 @@
{ stdenv, fetchurl, pkgconfig, glib, zlib }:
{ stdenv, fetchurl, pkgconfig, glib, zlib, libgpgerror }:
stdenv.mkDerivation rec {
name = "gmime-2.4.24";
name = "gmime-2.6.15";
src = fetchurl {
url = "mirror://gnome/sources/gmime/2.4/${name}.tar.gz";
sha256 = "2f538d68e215f075d16575a6da9acb87983db9e2df0d7d403858048881a0dd15";
url = "mirror://gnome/sources/gmime/2.6/${name}.tar.xz";
sha256 = "16n9gmlwn6rphi59hrwy6dpn785s3r13h2kmrn3k61l2kfws1hml";
};
outputs = [ "dev" "out" "bin" "doc" ];
outputs = [ "dev" "out" "doc" ];
buildInputs = [ pkgconfig glib zlib ];
nativeBuildInputs = [ pkgconfig ];
propagatedBuildInputs = [ glib zlib libgpgerror ];
enableParallelBuilding = true;
meta = {
homepage = http://spruce.sourceforge.net/gmime/;