From 5da5239588987aea9e0f30e13e0dedc7cfbcd8bb Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sat, 3 Dec 2005 00:04:13 +0000
Subject: [PATCH] * Added NEdit.

svn path=/nixpkgs/trunk/; revision=4329
---
 pkgs/applications/editors/nedit/builder.sh    | 11 ++++++++
 pkgs/applications/editors/nedit/default.nix   | 19 +++++++++++++
 pkgs/applications/editors/nedit/dynamic.patch | 27 +++++++++++++++++++
 pkgs/system/all-packages-generic.nix          |  7 +++++
 4 files changed, 64 insertions(+)
 create mode 100644 pkgs/applications/editors/nedit/builder.sh
 create mode 100644 pkgs/applications/editors/nedit/default.nix
 create mode 100644 pkgs/applications/editors/nedit/dynamic.patch

diff --git a/pkgs/applications/editors/nedit/builder.sh b/pkgs/applications/editors/nedit/builder.sh
new file mode 100644
index 000000000000..a16ff3f32e92
--- /dev/null
+++ b/pkgs/applications/editors/nedit/builder.sh
@@ -0,0 +1,11 @@
+source $stdenv/setup
+
+export NIX_CFLAGS_COMPILE="-DBUILD_UNTESTED_NEDIT -L$motif/lib $NIX_CFLAGS_COMPILE"
+
+installPhase=installPhase
+installPhase() {
+    ensureDir $out/bin
+    cp -p source/nedit source/nc $out/bin
+}
+
+genericBuild
diff --git a/pkgs/applications/editors/nedit/default.nix b/pkgs/applications/editors/nedit/default.nix
new file mode 100644
index 000000000000..2a1fcb904890
--- /dev/null
+++ b/pkgs/applications/editors/nedit/default.nix
@@ -0,0 +1,19 @@
+{stdenv, fetchurl, x11, motif, libXpm}:
+
+assert stdenv.system == "i686-linux";
+
+stdenv.mkDerivation {
+  name = "nedit-5.5";
+  builder = ./builder.sh;
+  
+  src = fetchurl {
+    url = http://nl.nedit.org/ftp/v5_5/nedit-5.5-src.tar.bz2;
+    md5 = "48cb3dce52d44988f3a4d7c6f47b6bbe";
+  };
+  patches = [./dynamic.patch];
+
+  inherit motif;
+  buildInputs = [x11 motif libXpm];
+
+  makeFlags = if stdenv.system == "i686-linux" then "linux" else "";
+}
diff --git a/pkgs/applications/editors/nedit/dynamic.patch b/pkgs/applications/editors/nedit/dynamic.patch
new file mode 100644
index 000000000000..adb2cbc25927
--- /dev/null
+++ b/pkgs/applications/editors/nedit/dynamic.patch
@@ -0,0 +1,27 @@
+diff -rc nedit-5.5-orig/makefiles/Makefile.linux nedit-5.5/makefiles/Makefile.linux
+*** nedit-5.5-orig/makefiles/Makefile.linux	2003-05-20 02:27:56.000000000 +0200
+--- nedit-5.5/makefiles/Makefile.linux	2005-12-03 00:42:23.000000000 +0100
+***************
+*** 17,27 ****
+  # To test if the Motif library exports the runtime version
+  # add -DHAVE__XMVERSIONSTRING to CFLAGS
+  #
+! CFLAGS=-O -I/usr/X11R6/include -DUSE_DIRENT -DUSE_LPR_PRINT_CMD
+  
+  ARFLAGS=-urs
+  
+! LIBS= -L/usr/X11R6/lib -Wl,-Bstatic -lXm -Wl,-Bdynamic -lXp -lXpm -lXext -lXt -lSM -lICE -lX11 -lm
+  
+  include Makefile.common
+  
+--- 17,27 ----
+  # To test if the Motif library exports the runtime version
+  # add -DHAVE__XMVERSIONSTRING to CFLAGS
+  #
+! CFLAGS=-O -DUSE_DIRENT -DUSE_LPR_PRINT_CMD
+  
+  ARFLAGS=-urs
+  
+! LIBS= -lXm -lXp -lXpm -lXext -lXt -lSM -lICE -lX11 -lm
+  
+  include Makefile.common
diff --git a/pkgs/system/all-packages-generic.nix b/pkgs/system/all-packages-generic.nix
index ffedf80a35a3..1b29ed209c53 100644
--- a/pkgs/system/all-packages-generic.nix
+++ b/pkgs/system/all-packages-generic.nix
@@ -1841,6 +1841,13 @@ rec {
 #    inherit fetchurl stdenv ncurses dietgcc;
 #  };
 
+  nedit = import ../applications/editors/nedit {
+    inherit fetchurl stdenv x11;
+    inherit (xlibs) libXpm;
+    motif = lesstif;
+  };
+
+
   ### GAMES
 
   zoom = (import ../games/zoom) {