From 8a8097eb90bc5e78f725dfd3e53f7b5415486927 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Thu, 26 Mar 2015 14:09:56 -0700 Subject: [PATCH] nedit: 5.5 -> 5.6 --- pkgs/applications/editors/nedit/builder.sh | 10 ------- pkgs/applications/editors/nedit/default.nix | 22 ++++++++------- pkgs/applications/editors/nedit/dynamic.patch | 27 ------------------- 3 files changed, 13 insertions(+), 46 deletions(-) delete mode 100644 pkgs/applications/editors/nedit/builder.sh delete mode 100644 pkgs/applications/editors/nedit/dynamic.patch diff --git a/pkgs/applications/editors/nedit/builder.sh b/pkgs/applications/editors/nedit/builder.sh deleted file mode 100644 index 15706b0c37d..00000000000 --- a/pkgs/applications/editors/nedit/builder.sh +++ /dev/null @@ -1,10 +0,0 @@ -source $stdenv/setup - -export NIX_CFLAGS_COMPILE="-DBUILD_UNTESTED_NEDIT -L$motif/lib $NIX_CFLAGS_COMPILE" - -installPhase() { - mkdir -p $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 index bd53f8d81d0..a4dfc4719dc 100644 --- a/pkgs/applications/editors/nedit/default.nix +++ b/pkgs/applications/editors/nedit/default.nix @@ -1,22 +1,26 @@ -{stdenv, fetchurl, x11, motif, libXpm}: +{ stdenv, fetchurl, x11, motif, libXpm }: assert stdenv.isLinux; -stdenv.mkDerivation { - name = "nedit-5.5"; - builder = ./builder.sh; +stdenv.mkDerivation rec { + name = "nedit-5.6"; src = fetchurl { - url = http://nl.nedit.org/ftp/v5_5/nedit-5.5-src.tar.bz2; - md5 = "48cb3dce52d44988f3a4d7c6f47b6bbe"; + url = "mirror://sourceforge/nedit/nedit-source/${name}-src.tar.gz"; + sha256 = "023hwpqc57mnzvg6p7jda6193afgjzxzajlhwhqvk3jq2kdv6zna"; }; - patches = [./dynamic.patch]; - inherit motif; - buildInputs = [x11 motif libXpm]; + buildInputs = [ x11 motif libXpm ]; buildFlags = if stdenv.isLinux then "linux" else ""; + NIX_CFLAGS_COMPILE="-DBUILD_UNTESTED_NEDIT -L${motif}/lib"; + + installPhase = '' + mkdir -p $out/bin + cp -p source/nedit source/nc $out/bin + ''; + meta = { homepage = http://www.nedit.org; }; diff --git a/pkgs/applications/editors/nedit/dynamic.patch b/pkgs/applications/editors/nedit/dynamic.patch deleted file mode 100644 index adb2cbc2592..00000000000 --- a/pkgs/applications/editors/nedit/dynamic.patch +++ /dev/null @@ -1,27 +0,0 @@ -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