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

Merging from trunk.

Browse Source 
I fixed conflicts regarding the renaming 'kernel' -> 'linux' in all-packages.
Also a small conflict in all-packages about making openssl overridable.
And I some linux 2.6.31-zen kernel files also marked in conflict.


svn path=/nixpkgs/branches/stdenv-updates/; revision=19438
This commit is contained in:
Lluís Batlle i Rossell
2010-01-14 14:49:31 +00:00
parent c161cd1773 c63858a169
commit 9183f21f7e
167 changed files with 3562 additions and 1240 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
pkgs/tools/compression/ncompress/builder.sh Normal file
View File

@@ -0,0 +1,14 @@
source $stdenv/setup
installFlags="PREFIX=$out"
preBuild() {
cp Makefile.def Makefile
}
postInstall() {
rm $out/bin/uncompress* $out/bin/zcat*
ln -s compress $out/bin/uncompress
ln -s compress $out/bin/zcat
}
genericBuild

18
pkgs/tools/compression/ncompress/default.nix Normal file
View File

@@ -0,0 +1,18 @@
{stdenv, fetchurl}:
stdenv.mkDerivation {
name = "ncompress-4.2.4";
builder = ./builder.sh;
patches = [ ./makefile.patch ];
src = fetchurl {
url = mirror://sourceforge/project/ncompress/ncompress%20%28bugfixes%29/ncompress-4.2.4.2/ncompress-4.2.4.2.tar.gz;
sha256 = "38158c792b769fe23c74f8d3ea0e27569a9b1d21b53a4faf8acbb1ac03743221";
};
meta = {
homepage = http://sourceforge.net/projects/ncompress/files/ncompress%20%28bugfixes%29/ncompress-4.2.4.2/ncompress-4.2.4.2.tar.gz/download;
};
}

31
pkgs/tools/compression/ncompress/makefile.patch Normal file
View File

@@ -0,0 +1,31 @@
diff -Naur ncompress-4.2.4.2.orig/Makefile.def ncompress-4.2.4.2/Makefile.def
--- ncompress-4.2.4.2.orig/Makefile.def 2007-09-06 22:28:42.000000000 -0500
+++ ncompress-4.2.4.2/Makefile.def 2009-08-18 12:30:53.000000000 -0500
@@ -3,14 +3,16 @@
# C complier
#CC=cc
+PREFIX=/usr/local
+
# Install prefix
DESTDIR=
# Install directory for binarys
-BINDIR=/usr/local/bin
+BINDIR=$(PREFIX)/bin
# Install directory for manual
-MANDIR=/usr/local/man/man1
+MANDIR=$(PREFIX)/man/man1
# compiler options:
# options is a collection of:
@@ -31,7 +33,7 @@
# -DDEF_ERRNO=1 Define error (not defined in errno.h).
# -DMAXSEG_64K=1 -BITS=16 Support segment processsor like 80286.
#
-options= $(CFLAGS) $(CPPFLAGS) -DDIRENT=1 -DUSERMEM=800000 -DREGISTERS=3
+options= $(CFLAGS) $(CPPFLAGS) -DDIRENT=1 -DUSERMEM=800000 -DREGISTERS=3 -DNOFUNCDEF=1
# libary options
LBOPT= $(LDFLAGS)