glabels: 3.2.1 -> 3.4.0

1 files changed, 10 insertions, 12 deletions

diff --git a/pkgs/applications/graphics/glabels/default.nix b/pkgs/applications/graphics/glabels/default.nix
index cf1ab1942e5..6dcf8223777 100644
--- a/pkgs/applications/graphics/glabels/default.nix
+++ b/pkgs/applications/graphics/glabels/default.nix
@@ -1,23 +1,23 @@
-{ stdenv, fetchFromGitHub, autoconf, automake, barcode, gnome3
+{ stdenv, fetchurl, barcode, gnome3, autoreconfHook
 , gtk3, gtk_doc, libxml2, librsvg , libtool, libe-book
 , intltool, itstool, makeWrapper, pkgconfig, which
 }:
 
 stdenv.mkDerivation rec {
   name = "glabels-${version}";
-  version = "3.2.1";
-  src = fetchFromGitHub {
-    owner = "jimevins";
-    repo = "glabels";
-    rev = "glabels-3_2_1";
-    sha256 = "1y6gz0v9si3cvdzhakbgkyc94fajg19rmykfgnc37alrc21vs9zg";
+  version = "3.4.0";
+
+  src = fetchurl {
+    url = "http://ftp.gnome.org/pub/GNOME/sources/glabels/3.4/glabels-3.4.0.tar.xz";
+    sha256 = "04345crf5yrhq6rlrymz630rxnm8yw41vx04hb6xn2nkjn9hf3nl";
   };
 
+  nativeBuildInputs = [ autoreconfHook pkgconfig makeWrapper intltool ];
   buildInputs = [
-    autoconf automake barcode gtk3 gtk_doc gnome3.yelp_tools
+    barcode gtk3 gtk_doc gnome3.yelp_tools
     gnome3.gnome_common gnome3.gsettings_desktop_schemas
-    intltool itstool libxml2 librsvg libe-book libtool
-    makeWrapper pkgconfig 
+    itstool libxml2 librsvg libe-book libtool
+    
   ];
 
   preFixup = ''
@@ -26,8 +26,6 @@ stdenv.mkDerivation rec {
       --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH"
   '';
 
-  preConfigure = "./autogen.sh";
-
   meta = {
     description = "Create labels and business cards";
     homepage = http://glabels.org/;