diff --git a/pkgs/development/libraries/grantlee/5.x-old.nix b/pkgs/development/libraries/grantlee/5.x-old.nix new file mode 100644 index 000000000000..4127280fb9a2 --- /dev/null +++ b/pkgs/development/libraries/grantlee/5.x-old.nix @@ -0,0 +1,32 @@ +{ stdenv, fetchurl, qt5, cmake }: + +stdenv.mkDerivation rec { + name = "grantlee-5.0.0"; + +# Upstream download server has country code firewall, so I made a mirror. + src = fetchurl { + urls = [ + "http://downloads.grantlee.org/${name}.tar.gz" + "http://www.loegria.net/grantlee/${name}.tar.gz" + ]; + sha256 = "0qdifp1sg87j3869xva5ai2d6d5ph7z4b85wv1fypf2k5sljpwpa"; + }; + + buildInputs = [ cmake qt5.base qt5.script ]; + + meta = { + description = "Qt5 port of Django template system"; + longDescription = '' + Grantlee is a plugin based String Template system written using the Qt + framework. The goals of the project are to make it easier for application + developers to separate the structure of documents from the data they + contain, opening the door for theming. + + The syntax is intended to follow the syntax of the Django template system, + and the design of Django is reused in Grantlee.''; + + homepage = http://gitorious.org/grantlee; + maintainers = [ stdenv.lib.maintainers.urkud ]; + inherit (qt5.base.meta) platforms; + }; +} diff --git a/pkgs/development/libraries/grantlee/5.x.nix b/pkgs/development/libraries/grantlee/5.x.nix index 4127280fb9a2..3323cbaeb4c9 100644 --- a/pkgs/development/libraries/grantlee/5.x.nix +++ b/pkgs/development/libraries/grantlee/5.x.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, qt5, cmake }: +{ stdenv, fetchurl, qtbase, qtscript, cmake }: stdenv.mkDerivation rec { name = "grantlee-5.0.0"; @@ -12,7 +12,8 @@ stdenv.mkDerivation rec { sha256 = "0qdifp1sg87j3869xva5ai2d6d5ph7z4b85wv1fypf2k5sljpwpa"; }; - buildInputs = [ cmake qt5.base qt5.script ]; + buildInputs = [ qtbase qtscript ]; + nativeBuildInputs = [ cmake ]; meta = { description = "Qt5 port of Django template system"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3db43923e24a..6b83bc00bf92 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6424,7 +6424,7 @@ let grantlee = callPackage ../development/libraries/grantlee { }; - grantlee5 = callPackage ../development/libraries/grantlee/5.x.nix { }; + grantlee5 = callPackage ../development/libraries/grantlee/5.x-old.nix { }; gsasl = callPackage ../development/libraries/gsasl { }; @@ -7936,6 +7936,8 @@ let accounts-qt = callPackage ../development/libraries/accounts-qt { }; + grantlee = callPackage ../development/libraries/grantlee/5.x.nix { }; + libdbusmenu = callPackage ../development/libraries/libdbusmenu-qt/qt-5.5.nix { }; phonon = callPackage ../development/libraries/phonon/qt5 { };