xmacro: 0.3pre20000911 -> 0.4.6; switch upstream

1 files changed, 6 insertions, 12 deletions

diff --git a/pkgs/tools/X11/xmacro/default.nix b/pkgs/tools/X11/xmacro/default.nix
index 758bf1729b174..e986b46aa4872 100644
--- a/pkgs/tools/X11/xmacro/default.nix
+++ b/pkgs/tools/X11/xmacro/default.nix
@@ -1,21 +1,15 @@
 { stdenv, fetchurl, libX11, libXtst, xextproto, libXi, inputproto }:
 
-stdenv.mkDerivation {
-  name = "xmacro-0.3pre20000911";
+stdenv.mkDerivation rec {
+  name = "xmacro-${version}";
+  version = "0.4.6";
 
   src = fetchurl {
-    url = mirror://sourceforge/xmacro/xmacro-pre0.3-20000911.tar.gz;
-    sha256 = "04gzgxhp8bx98zrcvmsm7mn72r9g9588skbf64cqvkp4yz6kfqhb";
+    url = "http://download.sarine.nl/xmacro/${name}.tar.gz";
+    sha256 = "1p9jljxyn4j6piljiyi2xv6f8jhjbzhabprp8p0qmqxaxgdipi61";
   };
 
-  preBuild = ''
-    sed -e 's/-pedantic//g' -i Makefile
-    sed -e 's/iostream[.]h/iostream/' -i *.cpp
-    sed -e 's/iomanip[.]h/iomanip/' -i *.cpp
-    sed -e '1iusing namespace std;' -i *.cpp
-  '';
-
-  preInstall = "echo -e 'install:\n	mkdir \${out}/bin;\n	cp xmacrorec xmacrorec2 xmacroplay \${out}/bin;' >>Makefile; ";
+  preInstall = "echo -e 'install:\n	mkdir \${out}/bin;\n	cp xmacrorec2 xmacroplay \${out}/bin;' >>Makefile; ";
 
   buildInputs = [ libX11 libXtst xextproto libXi inputproto ];