From 8cf1e97fcf8db2a4f8a4a3d2e52fc49b4e0c5ade Mon Sep 17 00:00:00 2001
From: worldofpeace <worldofpeace@users.noreply.github.com>
Date: Fri, 2 Nov 2018 12:44:05 -0400
Subject: granite: 5.1.0 -> 5.2.0

- Correct License to LGPLv3+
---
 pkgs/development/libraries/granite/default.nix | 21 +++++++++++++--------
 1 file changed, 13 insertions(+), 8 deletions(-)

(limited to 'pkgs/development/libraries')

diff --git a/pkgs/development/libraries/granite/default.nix b/pkgs/development/libraries/granite/default.nix
index 1ee0970ffad2..6892ea6364d7 100644
--- a/pkgs/development/libraries/granite/default.nix
+++ b/pkgs/development/libraries/granite/default.nix
@@ -1,12 +1,14 @@
-{ stdenv, fetchFromGitHub, perl, cmake, ninja, vala_0_40, pkgconfig, gobjectIntrospection, glib, gtk3, gnome3, gettext }:
+{ stdenv, fetchFromGitHub, cmake, ninja, vala_0_40, pkgconfig, gobjectIntrospection, gnome3, gtk3, glib, gettext }:
 
 stdenv.mkDerivation rec {
-  name = "granite-${version}";
-  version = "5.1.0";
+  pname = "granite";
+  version = "5.2.0";
+
+  name = "${pname}-${version}";
 
   src = fetchFromGitHub {
     owner = "elementary";
-    repo = "granite";
+    repo = pname;
     rev = version;
     sha256 = "1v1yhz6rp616xi417m9r8072s6mpz5i8vkdyj264b73p0lgjwh40";
   };
@@ -21,10 +23,10 @@ stdenv.mkDerivation rec {
     gettext
     gobjectIntrospection
     ninja
-    perl
     pkgconfig
-    vala_0_40
+    vala_0_40 # should be `elementary.vala` when elementary attribute set is merged
   ];
+
   buildInputs = [
     glib
     gnome3.libgee
@@ -33,9 +35,12 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "An extension to GTK+ used by elementary OS";
-    longDescription = "An extension to GTK+ that provides several useful widgets and classes to ease application development. Designed for elementary OS.";
+    longDescription = ''
+      Granite is a companion library for GTK+ and GLib. Among other things, it provides complex widgets and convenience functions
+      designed for use in apps built for elementary OS.
+    '';
     homepage = https://github.com/elementary/granite;
-    license = licenses.lgpl3;
+    license = licenses.lgpl3Plus;
     platforms = platforms.linux;
     maintainers = with maintainers; [ vozz worldofpeace ];
   };
-- 
cgit 1.4.1