From 9785fc73a07ddb11628c25949cf7b2eb51b183c6 Mon Sep 17 00:00:00 2001 From: Servilio Afre Puentes Date: Thu, 31 Aug 2017 11:01:08 -0400 Subject: [PATCH] gmime: init at 3.0.1, leave 2.6.23 as is This needs to be added as a separate package because API changed in 3.0, see: https://mail.gnome.org/archives/gmime-devel-list/2017-April/msg00002.html https://developer.gnome.org/gmime/3.0/gmime-changes-3-0.html https://github.com/jstedfast/gmime/blob/3fd646c95503acb0d11bf67afde1c7bdd4fcc341/PORTING --- .../libraries/gmime/{default.nix => 2.nix} | 7 ++--- pkgs/development/libraries/gmime/3.nix | 26 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 4 ++- 3 files changed, 33 insertions(+), 4 deletions(-) rename pkgs/development/libraries/gmime/{default.nix => 2.nix} (82%) create mode 100644 pkgs/development/libraries/gmime/3.nix diff --git a/pkgs/development/libraries/gmime/default.nix b/pkgs/development/libraries/gmime/2.nix similarity index 82% rename from pkgs/development/libraries/gmime/default.nix rename to pkgs/development/libraries/gmime/2.nix index a01f3890453..5477a20d203 100644 --- a/pkgs/development/libraries/gmime/default.nix +++ b/pkgs/development/libraries/gmime/2.nix @@ -16,10 +16,11 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - meta = { + meta = with stdenv.lib; { homepage = https://github.com/jstedfast/gmime/; description = "A C/C++ library for creating, editing and parsing MIME messages and structures"; - maintainers = [ stdenv.lib.maintainers.chaoflow ]; - platforms = stdenv.lib.platforms.unix; + license = licenses.lgpl21Plus; + maintainers = with maintainers; [ chaoflow ]; + platforms = platforms.unix; }; } diff --git a/pkgs/development/libraries/gmime/3.nix b/pkgs/development/libraries/gmime/3.nix new file mode 100644 index 00000000000..319db5b3092 --- /dev/null +++ b/pkgs/development/libraries/gmime/3.nix @@ -0,0 +1,26 @@ +{ stdenv, fetchurl, pkgconfig, glib, zlib, gpgme, libidn, gobjectIntrospection }: + +stdenv.mkDerivation rec { + name = "gmime-3.0.1"; + + src = fetchurl { + url = "mirror://gnome/sources/gmime/3.0/${name}.tar.xz"; + sha256 = "001y93b8mq9alzkvli6vfh3pzdcn5c5iy206ml23lzhhhvm5k162"; + }; + + outputs = [ "out" "dev" ]; + + nativeBuildInputs = [ pkgconfig gobjectIntrospection ]; + propagatedBuildInputs = [ glib zlib gpgme libidn ]; + configureFlags = [ "--enable-introspection=yes" ]; + + enableParallelBuilding = true; + + meta = with stdenv.lib; { + homepage = https://github.com/jstedfast/gmime/; + description = "A C/C++ library for creating, editing and parsing MIME messages and structures"; + license = licenses.lgpl21Plus; + maintainers = with maintainers; [ chaoflow ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 162fb993290..5b3ea1e1625 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8187,7 +8187,9 @@ with pkgs; glui = callPackage ../development/libraries/glui {}; - gmime = callPackage ../development/libraries/gmime { }; + gmime2 = callPackage ../development/libraries/gmime/2.nix { }; + gmime3 = callPackage ../development/libraries/gmime/3.nix { }; + gmime = gmime2; gmm = callPackage ../development/libraries/gmm { };