From a2c118e0e3806d1662beda70d9788008ce501c21 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 7 Aug 2006 10:17:39 +0000 Subject: * Remove redundant definition of LayYY_prev_more_offset; flex already generates it. svn path=/nixpkgs/trunk/; revision=6064 --- pkgs/development/libraries/Xaw3d/default.nix | 2 +- pkgs/development/libraries/Xaw3d/laylex.patch | 13 +++++++++++++ 2 files changed, 14 insertions(+), 1 deletion(-) create mode 100644 pkgs/development/libraries/Xaw3d/laylex.patch (limited to 'pkgs') diff --git a/pkgs/development/libraries/Xaw3d/default.nix b/pkgs/development/libraries/Xaw3d/default.nix index 3245ec7eccb..da99571a82a 100644 --- a/pkgs/development/libraries/Xaw3d/default.nix +++ b/pkgs/development/libraries/Xaw3d/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation { url = http://nix.cs.uu.nl/dist/tarballs/Xaw3d-1.5E.tar.gz; md5 = "29ecfdcd6bcf47f62ecfd672d31269a1"; }; - patches = [./config.patch]; + patches = [./config.patch ./laylex.patch]; buildInputs = [x11 imake gccmakedep libXmu libXpm libXp bison flex]; propagatedBuildInputs = [x11 libXmu]; } diff --git a/pkgs/development/libraries/Xaw3d/laylex.patch b/pkgs/development/libraries/Xaw3d/laylex.patch new file mode 100644 index 00000000000..911ea800ec6 --- /dev/null +++ b/pkgs/development/libraries/Xaw3d/laylex.patch @@ -0,0 +1,13 @@ +diff -rc xc-orig/lib/Xaw3d/laylex.l xc/lib/Xaw3d/laylex.l +*** xc-orig/lib/Xaw3d/laylex.l 2006-08-07 12:12:54.000000000 +0200 +--- xc/lib/Xaw3d/laylex.l 2006-08-07 12:14:49.000000000 +0200 +*************** +*** 27,33 **** + static int count (); + #endif + +- static int LayYY_prev_more_offset = 0; + %} + %% + vertical return VERTICAL; +--- 27,32 ---- -- cgit 1.4.1