summary refs log tree commit diff
path: root/pkgs/applications/misc/gpsbabel
diff options
context:
space:
mode:
authorRobert Helgesson <robert@rycee.net>2017-02-28 23:52:52 +0100
committerRobert Helgesson <robert@rycee.net>2017-03-01 00:00:10 +0100
commit61237e17380b64f8e2879f082a06d719f729e30a (patch)
tree9e8e00fb3e53259e7a00d355d68e2ab1253a2009 /pkgs/applications/misc/gpsbabel
parentcf9cb1bac3fe61b3cac5dcd3aca5e2c214186a24 (diff)
downloadnixpkgs-61237e17380b64f8e2879f082a06d719f729e30a.tar
nixpkgs-61237e17380b64f8e2879f082a06d719f729e30a.tar.gz
nixpkgs-61237e17380b64f8e2879f082a06d719f729e30a.tar.bz2
nixpkgs-61237e17380b64f8e2879f082a06d719f729e30a.tar.lz
nixpkgs-61237e17380b64f8e2879f082a06d719f729e30a.tar.xz
nixpkgs-61237e17380b64f8e2879f082a06d719f729e30a.tar.zst
nixpkgs-61237e17380b64f8e2879f082a06d719f729e30a.zip
gpsbabel: 1.5.2 -> 1.5.3
Diffstat (limited to 'pkgs/applications/misc/gpsbabel')
-rw-r--r--pkgs/applications/misc/gpsbabel/default.nix14
1 files changed, 10 insertions, 4 deletions
diff --git a/pkgs/applications/misc/gpsbabel/default.nix b/pkgs/applications/misc/gpsbabel/default.nix
index 38f81a979b3..6c248bc4dfa 100644
--- a/pkgs/applications/misc/gpsbabel/default.nix
+++ b/pkgs/applications/misc/gpsbabel/default.nix
@@ -1,16 +1,23 @@
-{ stdenv, fetchurl, zlib, qt4, which }:
+{ stdenv, fetchurl, fetchpatch, zlib, qt4, which }:
 
 stdenv.mkDerivation rec {
   name = "gpsbabel-${version}";
-  version = "1.5.2";
+  version = "1.5.3";
 
   src = fetchurl {
     # gpgbabel.org makes it hard to get the source tarball automatically, so
     # get it from elsewhere.
     url = "mirror://debian/pool/main/g/gpsbabel/gpsbabel_${version}.orig.tar.gz";
-    sha256 = "0xf7wmy2m29g2lm8lqc74yf8rf7sxfl3cfwbk7dpf0yf42pb0b6w";
+    sha256 = "0l6c8911f7i5bbdzah9irhqf127ib0b7lv53rb8r9z8g439mznq1";
   };
 
+  patches = [
+    (fetchpatch {
+      url = https://sources.debian.net/data/main/g/gpsbabel/1.5.3-2/debian/patches/use_minizip;
+      sha256 = "03fpsmlx1wc48d1j405zkzp8j64hcp0z72islf4mk1immql3ibcr";
+    })
+  ];
+
   buildInputs = [ zlib qt4 which ];
 
   /* FIXME: Building the documentation, with "make doc", requires this:
@@ -19,7 +26,6 @@ stdenv.mkDerivation rec {
 
     But FOP isn't packaged yet.  */
 
-  preConfigure = "cd gpsbabel";
   configureFlags = [ "--with-zlib=system" ]
     # Floating point behavior on i686 causes test failures. Preventing
     # extended precision fixes this problem.