public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

nedit: 5.5 -> 5.6

Browse Source
This commit is contained in:
William A. Kennington III 2015-03-26 14:09:56 -07:00
parent 78d8e55245
commit 8a8097eb90
3 changed files with 13 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pkgs/applications/editors/nedit/builder.sh
View File

@ -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

22
pkgs/applications/editors/nedit/default.nix
View File

@ -1,22 +1,26 @@
{stdenv, fetchurl, x11, motif, libXpm}: { stdenv, fetchurl, x11, motif, libXpm }:
assert stdenv.isLinux; assert stdenv.isLinux;
stdenv.mkDerivation { stdenv.mkDerivation rec {
name = "nedit-5.5"; name = "nedit-5.6";
builder = ./builder.sh;
src = fetchurl { src = fetchurl {
url = http://nl.nedit.org/ftp/v5_5/nedit-5.5-src.tar.bz2; url = "mirror://sourceforge/nedit/nedit-source/${name}-src.tar.gz";
md5 = "48cb3dce52d44988f3a4d7c6f47b6bbe"; sha256 = "023hwpqc57mnzvg6p7jda6193afgjzxzajlhwhqvk3jq2kdv6zna";
}; };
patches = [./dynamic.patch];
inherit motif; buildInputs = [ x11 motif libXpm ];
buildInputs = [x11 motif libXpm];
buildFlags = if stdenv.isLinux then "linux" else ""; 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 = { meta = {
homepage = http://www.nedit.org; homepage = http://www.nedit.org;
}; };

27
pkgs/applications/editors/nedit/dynamic.patch
View File

@ -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