diff options
| author | William A. Kennington III <william@wkennington.com> | 2015-03-26 14:09:56 -0700 |
|---|---|---|
| committer | William A. Kennington III <william@wkennington.com> | 2015-03-26 14:10:06 -0700 |
| commit | 8a8097eb90bc5e78f725dfd3e53f7b5415486927 (patch) | |
| tree | b21c06edc5f16f1189801ee223dc2edca771e80e /pkgs/applications/editors/nedit | |
| parent | 78d8e55245030575ca9e3a2378ca558bba4cad9d (diff) | |
| download | nixlib-8a8097eb90bc5e78f725dfd3e53f7b5415486927.tar nixlib-8a8097eb90bc5e78f725dfd3e53f7b5415486927.tar.gz nixlib-8a8097eb90bc5e78f725dfd3e53f7b5415486927.tar.bz2 nixlib-8a8097eb90bc5e78f725dfd3e53f7b5415486927.tar.lz nixlib-8a8097eb90bc5e78f725dfd3e53f7b5415486927.tar.xz nixlib-8a8097eb90bc5e78f725dfd3e53f7b5415486927.tar.zst nixlib-8a8097eb90bc5e78f725dfd3e53f7b5415486927.zip | |
nedit: 5.5 -> 5.6
Diffstat (limited to 'pkgs/applications/editors/nedit')
| -rw-r--r-- | pkgs/applications/editors/nedit/builder.sh | 10 | ||||
| -rw-r--r-- | pkgs/applications/editors/nedit/default.nix | 22 | ||||
| -rw-r--r-- | pkgs/applications/editors/nedit/dynamic.patch | 27 |
3 files changed, 13 insertions, 46 deletions
diff --git a/pkgs/applications/editors/nedit/builder.sh b/pkgs/applications/editors/nedit/builder.sh deleted file mode 100644 index 15706b0c37dd..000000000000 --- 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 bd53f8d81d08..a4dfc4719dc4 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 adb2cbc25927..000000000000 --- 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 |