From e9a5a5d81987923ae5977cb780bcbb51d93e1fce Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Tue, 23 Aug 2011 17:52:05 +0000 Subject: [PATCH] Fix xmacro build svn path=/nixpkgs/trunk/; revision=28787 --- pkgs/tools/X11/xmacro/default.nix | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/X11/xmacro/default.nix b/pkgs/tools/X11/xmacro/default.nix index 1b18138f28b3..12bb2903107c 100644 --- a/pkgs/tools/X11/xmacro/default.nix +++ b/pkgs/tools/X11/xmacro/default.nix @@ -8,7 +8,12 @@ stdenv.mkDerivation { md5 = "d2956b82f3d5380e58a75ccc721fb746"; }; - preBuild = " sed -e 's/-pedantic//g' -i Makefile "; + 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; ";