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

ISC DHCP: Add a proper wrapper for dhclient-script' so that it finds hostname'

Browse Source 
and friends; add a patch so that "make install" doesn't try to
"mkdir /var/run"; add `meta' attribute.

svn path=/nixpkgs/trunk/; revision=11123
This commit is contained in:
Ludovic Courtès 2008-03-14 13:40:32 +00:00
parent 6aa42a8021
commit c02aea1925
3 changed files with 43 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
pkgs/tools/networking/dhcp/default.nix
View File

@ -1,4 +1,5 @@
{stdenv, fetchurl, groff, nettools, coreutils, iputils, gnused, bash}:
{ stdenv, fetchurl, groff, nettools, coreutils, iputils, gnused,
bash, makeWrapper }:
stdenv.mkDerivation {
name = "dhcp-3.0.6";
@ -7,7 +8,21 @@ stdenv.mkDerivation {
url = http://ftp.isc.org/isc/dhcp/dhcp-3.0.6.tar.gz;
sha256 = "0k8gy3ab9kzs4qcc9apgnxi982lhggha41fkw9w1bmvmz7mv0xwz";
};
buildInputs = [groff];
inherit nettools coreutils iputils gnused bash;
patches = [./resolv-without-domain.patch];
buildInputs = [ groff nettools makeWrapper ];
# inherit nettools coreutils iputils gnused bash;
patches = [ ./resolv-without-domain.patch ./no-mkdir-var-run.patch ];
postInstall = ''
wrapProgram "$out/sbin/dhclient-script" --prefix PATH : \
"${nettools}/bin:${nettools}/sbin"
'';
meta = {
description = ''ISC's Dynamic Host Configuration Protocol (DHCP)
distribution provides a freely redistributable reference
implementation of all aspects of DHCP, through a suite
of DHCP tools: server, client, and relay agent.'';
homepage = http://www.isc.org/products/DHCP/;
license = "http://www.isc.org/sw/dhcp/dhcp-copyright.php";
};
}

22
pkgs/tools/networking/dhcp/no-mkdir-var-run.patch Normal file
View File

@ -0,0 +1,22 @@
--- dhcp-3.0.6/client/Makefile.dist 2008-03-14 14:36:04.000000000 +0100
+++ dhcp-3.0.6/client/Makefile.dist 2008-03-14 14:36:06.000000000 +0100
@@ -38,7 +38,7 @@ CFLAGS = $(DEBUG) $(PREDEFINES) $(INCLUD
all: $(PROG) $(CATMANPAGES)
install: all
- for dir in $(CLIENTBINDIR) $(ETC) $(FFMANDIR) $(ADMMANDIR) $(VARDB); \
+ for dir in $(CLIENTBINDIR) $(ETC) $(FFMANDIR) $(ADMMANDIR); \
do \
foo=""; \
for bar in `echo $(DESTDIR)$${dir} |tr / ' '`; do \
--- dhcp-3.0.6/server/Makefile.dist 2008-03-14 14:37:05.000000000 +0100
+++ dhcp-3.0.6/server/Makefile.dist 2008-03-14 14:37:13.000000000 +0100
@@ -38,7 +38,7 @@ CFLAGS = $(DEBUG) $(PREDEFINES) $(INCLUD
all: $(PROG) $(CATMANPAGES)
install: all
- for dir in $(BINDIR) $(ADMMANDIR) $(FFMANDIR) $(VARDB); do \
+ for dir in $(BINDIR) $(ADMMANDIR) $(FFMANDIR); do \
foo=""; \
for bar in `echo $(DESTDIR)$${dir} |tr / ' '`; do \
foo=$${foo}/$$bar; \

3
pkgs/top-level/all-packages.nix
View File

@ -502,7 +502,8 @@ rec {
};
dhcp = import ../tools/networking/dhcp {
inherit fetchurl stdenv groff nettools coreutils iputils gnused bash;
inherit fetchurl stdenv groff nettools coreutils iputils gnused
bash makeWrapper;
};
diffutils = useFromStdenv "diffutils"