Merge pull request #5046 from abbradar/checksum-fixes

Checksum fixes

2 files changed, 21 insertions, 25 deletions

diff --git a/pkgs/applications/misc/eaglemode/default.nix b/pkgs/applications/misc/eaglemode/default.nix
index ea9383a6e10f..9d9b22abcb19 100644
--- a/pkgs/applications/misc/eaglemode/default.nix
+++ b/pkgs/applications/misc/eaglemode/default.nix
@@ -1,16 +1,16 @@
 { stdenv, fetchurl, perl, libX11, libjpeg, libpng, libtiff, pkgconfig,
-librsvg, glib, gtk, libXext, libXxf86vm, poppler }:
+librsvg, glib, gtk, libXext, libXxf86vm, poppler, xineLib }:
 
 stdenv.mkDerivation rec {
-  name = "eaglemode-0.85.0";
+  name = "eaglemode-0.86.0";
 
   src = fetchurl {
     url = "mirror://sourceforge/eaglemode/${name}.tar.bz2";
-    sha256 = "0mz4rg2k36wvcv55dg0a5znaczpl5h4gwkkb34syj89xk8jlbwsc";
+    sha256 = "1a2hzyck95g740qg4p4wd4fjwsmlknh75i9sbx5r5v9pyr4i3m4f";
   };
 
   buildInputs = [ perl libX11 libjpeg libpng libtiff pkgconfig
-    librsvg glib gtk libXxf86vm libXext poppler ];
+    librsvg glib gtk libXxf86vm libXext poppler xineLib ];
 
   # The program tries to dlopen both Xxf86vm and Xext, so we use the
   # trick on NIX_LDFLAGS and dontPatchELF to make it find them.
diff --git a/pkgs/applications/misc/gosmore/default.nix b/pkgs/applications/misc/gosmore/default.nix
index e93e2be85e38..ea72dc032695 100644
--- a/pkgs/applications/misc/gosmore/default.nix
+++ b/pkgs/applications/misc/gosmore/default.nix
@@ -1,34 +1,30 @@
-a@{fetchsvn, libxml2, gtk, curl, pkgconfig, lib, ...} :  
-let 
-  fetchsvn = a.fetchsvn;
+{ stdenv, fetchsvn, libxml2, gtk, curl, pkgconfig } :
 
-  buildInputs = with a; [
-    libxml2 gtk curl pkgconfig
-  ];
+let
+  version = "30811";
 in
-rec {
+stdenv.mkDerivation {
+  name = "gosmore-r${version}";
   src = fetchsvn {
     url = http://svn.openstreetmap.org/applications/rendering/gosmore;
-    sha256 = "0ds61gl75rnzvm0hj9papl5sfcgdv4310df9ch7x9rifssfli9zm";
-    rev = "24178";
-  } + "/";
+    sha256 = "0qyvrb4xgy4msc7f65widzkvjzc8mlddc4dyr1i76b7wd3gpk0xj";
+    rev = "${version}";
+  };
 
-  inherit buildInputs;
-  configureFlags = [];
+  buildInputs = [ libxml2 gtk curl ];
 
-  /* doConfigure should be removed if not needed */
-  phaseNames = ["fixCurlIncludes" "doConfigure" "doMakeInstall"];
+  nativeBuildInputs = [ pkgconfig ];
 
-  fixCurlIncludes = a.fullDepEntry ''
+  prePatch = ''
     sed -e '/curl.types.h/d' -i *.{c,h,hpp,cpp}
-  '' ["minInit" "doUnpack"];
+  '';
       
-  name = "gosmore-r21657";
-  meta = {
+  meta = with stdenv.lib; {
     description = "Open Street Map viewer";
-    maintainers = [
-      a.lib.maintainers.raskin
+    homepage = http://sourceforge.net/projects/gosmore/;
+    maintainers = with maintainers; [
+      raskin
     ];
-    platforms = a.lib.platforms.linux;
+    platforms = platforms.linux;
   };
 }