* Got rid of a lot of "postInstall=postInstall" and similar lines in

builders.  These are redundant now.
* Inlined some trivial builders.
* Removed a few explicit setup-hook creations.  This is done
  automatically now if setupHook is set.
* Deleted the initscripts package.  NixOS doesn't use it anymore.

svn path=/nixpkgs/branches/stdenv-updates/; revision=15276
This commit is contained in:
Eelco Dolstra 2009-04-23 13:31:10 +00:00
parent 0f10222e4e
commit 7689a348c4
88 changed files with 120 additions and 387 deletions

View file

@ -1,11 +0,0 @@
source $stdenv/setup
buildFlags="-f Makefile.bmp"
installPhase=installPhase
installPhase() {
ensureDir "$out/lib/bmp/Input"
cp libwma.so "$out/lib/bmp/Input"
}
genericBuild

View file

@ -2,10 +2,18 @@
stdenv.mkDerivation {
name = "bmp-plugin-wma-1.0.5";
builder = ./builder.sh;
src = fetchurl {
url = http://mcmcc.bat.ru/xmms-wma/xmms-wma-1.0.5.tar.bz2;
md5 = "5d62a0f969617aeb40096362c7a8a506";
};
buildInputs = [pkgconfig bmp];
buildFlags = "-f Makefile.bmp";
installPhase = ''
ensureDir "$out/lib/bmp/Input"
cp libwma.so "$out/lib/bmp/Input"
'';
}

View file

@ -8,6 +8,5 @@ postConfigure() {
cp $myglibc/lib/crti.o src
cp $myglibc/lib/crtn.o src
}
postConfigure=postConfigure
genericBuild

View file

@ -1,6 +1,5 @@
source $stdenv/setup
preConfigure=preConfigure
preConfigure() {
libc=$(cat ${NIX_GCC}/nix-support/orig-libc)
echo "libc: $libc"

View file

@ -1,6 +1,5 @@
source $stdenv/setup
preConfigure=preConfigure
preConfigure() {
libc=$(cat ${NIX_GCC}/nix-support/orig-libc)
echo "libc: $libc"

View file

@ -3,7 +3,6 @@ source $makeWrapper
export MONO_GAC_PREFIX=$monodoc:$gtksharp
postInstall=postInstall
postInstall() {
mv $out/bin $out/bin-orig
mkdir $out/bin

View file

@ -1,7 +1,6 @@
source $stdenv/setup
source $makeWrapper
postInstall=postInstall
postInstall() {
mv $out/bin $out/bin-orig
mkdir $out/bin

View file

@ -2,7 +2,6 @@ source $stdenv/setup
export NIX_CFLAGS_COMPILE="-DBUILD_UNTESTED_NEDIT -L$motif/lib $NIX_CFLAGS_COMPILE"
installPhase=installPhase
installPhase() {
ensureDir $out/bin
cp -p source/nedit source/nc $out/bin

View file

@ -1,7 +1,6 @@
source $stdenv/setup
source $makeWrapper
postInstall=postInstall
postInstall() {
mv $out/bin $out/bin-orig
mkdir $out/bin

View file

@ -2,7 +2,6 @@ source $stdenv/setup
makeFlags="XAWLIB=-lXaw3d BINDIR=$out/bin XAPPLOADDIR=$out/etc/X11/app-defaults LIBDIR=$out/lib/X11 XFIGDOCDIR=$out/share/doc/xfig MANPATH=$out/man"
preBuild=preBuild
preBuild() {
echo "#define XAW3D" >> Imakefile.tmp
echo "#define XAW3D1_5E" >> Imakefile.tmp

View file

@ -1,11 +0,0 @@
source $stdenv/setup
prefix=$out
configurePhase() {
echo ;
}
configurePhase=configurePhase
genericBuild

View file

@ -2,7 +2,9 @@
stdenv.mkDerivation {
name = "cdrtools-2.01";
builder = ./builder.sh;
configurePhase = "prefix=$out";
#hack, I'm getting "chown: invalid user: `bin" error, so replace chown by a nop dummy script
preInstall = ''
mkdir "$TMP/bin"
@ -12,10 +14,12 @@ stdenv.mkDerivation {
PATH="$TMP/bin:$PATH"
done
'';
src = fetchurl {
url = ftp://ftp.berlios.de/pub/cdrecord/cdrtools-2.01.tar.bz2;
md5 = "d44a81460e97ae02931c31188fe8d3fd";
};
patches = [./cdrtools-2.01-install.patch];
meta = {

View file

@ -1,6 +1,5 @@
source $stdenv/setup
postInstall=postInstall
postInstall() {
# Strip some more stuff

View file

@ -1,6 +1,5 @@
source $stdenv/setup
preConfigure=preConfigure
preConfigure() {
cat > .mozconfig <<EOF
#. \$topsrcdir/browser/config/mozconfig
@ -20,7 +19,6 @@ ac_add_options --enable-default-toolkit=gtk2
EOF
}
#postInstall=postInstall
postInstall() {
# Strip some more stuff

View file

@ -1,11 +1,9 @@
source $stdenv/setup
buildPhase=buildPhase
buildPhase() {
true
}
installPhase=installPhase
installPhase() {
set -x

View file

@ -1,6 +1,5 @@
source $stdenv/setup
postInstall=postInstall
postInstall() {
# Strip some more stuff

View file

@ -5,12 +5,10 @@ export NO_HIDS=TRUE
export PATH=$icu/sbin:$PATH
postUnpack=postUnpack
postUnpack() {
tar xvjf $src_system
}
preConfigure=preConfigure
preConfigure() {
for i in sysui/desktop/share/makefile.mk; do
substituteInPlace $i --replace /bin/bash $shell
@ -23,8 +21,6 @@ preConfigure() {
cd config_office/
}
postConfigure=postConfigure
postConfigure() {
cd ..
for i in LinuxX86*Env.Set; do
@ -35,15 +31,12 @@ postConfigure() {
--replace /usr/lib64/libjpeg.so $libjpeg/lib/libjpeg.so
}
buildPhase=buildPhase
buildPhase() {
source LinuxX86*Env.Set.sh
./bootstrap
dmake # wait a few hours...
}
wrapSOffice() {
local fn=$1
local arg=$2
@ -61,8 +54,6 @@ EOF
chmod +x $out/bin/$fn
}
installPhase=installPhase
installPhase() {
ooFiles=$out/lib/openoffice
@ -85,6 +76,5 @@ installPhase() {
for i in writer calc draw impress base math web; do wrapSOffice oo$i -$i; done
}
genericBuild

View file

@ -1,6 +1,5 @@
source $stdenv/setup
buildPhase=buildPhase
buildPhase() {
for i in bin/*; do
patchelf \
@ -10,10 +9,9 @@ buildPhase() {
done
}
installPhase=installPhase
installPhase() {
ensureDir $out
cp -prvd * $out/
}
genericBuild
genericBuild

View file

@ -1,6 +1,5 @@
source $stdenv/setup
buildPhase=buildPhase
buildPhase() {
for i in bin/*; do
patchelf \
@ -10,10 +9,9 @@ buildPhase() {
done
}
installPhase=installPhase
installPhase() {
ensureDir $out
cp -prvd * $out/
}
genericBuild
genericBuild

View file

@ -2,7 +2,6 @@ source $stdenv/setup
echo $NIX_GCC
buildPhase=buildPhase
buildPhase() {
for i in bin/*; do
patchelf \
@ -12,10 +11,9 @@ buildPhase() {
done
}
installPhase=installPhase
installPhase() {
ensureDir $out
cp -prvd * $out/
}
genericBuild
genericBuild

View file

@ -2,7 +2,6 @@ source $stdenv/setup
echo $NIX_GCC
buildPhase=buildPhase
buildPhase() {
for i in bin/*; do
patchelf \
@ -12,10 +11,9 @@ buildPhase() {
done
}
installPhase=installPhase
installPhase() {
ensureDir $out
cp -prvd * $out/
}
genericBuild
genericBuild

View file

@ -1,11 +0,0 @@
source $stdenv/setup
buildPhase=true
installPhase() {
mkdir $out
cp -prv * $out
}
installPhase=installPhase
genericBuild

View file

@ -1,8 +1,15 @@
{stdenv, fetchurl}: stdenv.mkDerivation {
{stdenv, fetchurl}:
stdenv.mkDerivation {
name = "MPlayer-rp9codecs-20050115";
builder = ./builder.sh;
src = fetchurl {
url = http://www2.mplayerhq.hu/MPlayer/releases/codecs/rp9codecs-20050115.tar.bz2;
sha256 = "353c22e2c992a1c730bdd5fade66a94e1a058e38063d2ce064a6510b70c39677";
};
installPhase = ''
mkdir $out
cp -prv * $out
'';
}

View file

@ -1,11 +0,0 @@
source $stdenv/setup
buildPhase=true
installPhase() {
mkdir $out
cp -prv * $out
}
installPhase=installPhase
genericBuild

View file

@ -3,13 +3,16 @@
stdenv.mkDerivation {
name = "MPlayer-codecs-essential-20071007";
builder = ./builder.sh;
src = fetchurl {
url = http://www2.mplayerhq.hu/MPlayer/releases/codecs/essential-20071007.tar.bz2;
sha256 = "18vls12n12rjw0mzw4pkp9vpcfmd1c21rzha19d7zil4hn7fs2ic";
};
installPhase = ''
mkdir $out
cp -prv * $out
'';
meta = {
license = "unfree";
};

View file

@ -15,7 +15,6 @@ buildPhase() {
}
postInstall=postInstall
postInstall() {
sqlDir="$out/share/mythtv/sql"
ensureDir $sqlDir

View file

@ -115,8 +115,6 @@ test -n "$libc" && echo $libc > $out/nix-support/orig-libc
doSubstitute "$addFlags" "$out/nix-support/add-flags.sh"
doSubstitute "$setupHook" "$out/nix-support/setup-hook"
cp -p $utils $out/nix-support/utils.sh

View file

@ -3,7 +3,6 @@ source $stdenv/setup
echo $xlibs2
echo $x_libraries_env
postConfigure=postConfigure
postConfigure() {
pwd;
ls -l super*/src/Makefile;

View file

@ -47,7 +47,6 @@ else
fi
preConfigure=preConfigure
preConfigure() {
# Determine the frontends to build.

View file

@ -38,8 +38,6 @@ EOF
configureFlags="--enable-languages=$langs"
}
preConfigure=preConfigure
postConfigure() {
if test "$noSysDirs" = "1"; then
@ -82,8 +80,6 @@ postConfigure() {
fi
}
postConfigure=postConfigure
buildFlags="bootstrap"

View file

@ -35,7 +35,6 @@ if test "$noSysDirs" = "1"; then
fi
preConfigure=preConfigure
preConfigure() {
# Perform the build in a different directory.
mkdir ../build
@ -44,7 +43,6 @@ preConfigure() {
}
postInstall=postInstall
postInstall() {
# Remove precompiled headers for now. They are very big and
# probably not very useful yet.

View file

@ -54,7 +54,6 @@ if test "$noSysDirs" = "1"; then
fi
preConfigure=preConfigure
preConfigure() {
# Perform the build in a different directory.
mkdir ../build
@ -63,7 +62,6 @@ preConfigure() {
}
postInstall=postInstall
postInstall() {
# Remove precompiled headers for now. They are very big and
# probably not very useful yet.

View file

@ -50,7 +50,6 @@ if test "$noSysDirs" = "1"; then
fi
preConfigure=preConfigure
preConfigure() {
# Perform the build in a different directory.
mkdir ../build
@ -59,7 +58,6 @@ preConfigure() {
}
postInstall=postInstall
postInstall() {
# Remove precompiled headers for now. They are very big and
# probably not very useful yet.

View file

@ -51,7 +51,6 @@ if test "$noSysDirs" = "1"; then
fi
preConfigure=preConfigure
preConfigure() {
# Perform the build in a different directory.
mkdir ../build
@ -60,7 +59,6 @@ preConfigure() {
}
postInstall=postInstall
postInstall() {
# Remove precompiled headers for now. They are very big and
# probably not very useful yet.

View file

@ -51,7 +51,6 @@ if test "$noSysDirs" = "1"; then
fi
preConfigure=preConfigure
preConfigure() {
# Perform the build in a different directory.
mkdir ../build
@ -60,7 +59,6 @@ preConfigure() {
}
postInstall=postInstall
postInstall() {
# Remove precompiled headers for now. They are very big and
# probably not very useful yet.

View file

@ -51,7 +51,6 @@ if test "$noSysDirs" = "1"; then
fi
preConfigure=preConfigure
preConfigure() {
# Determine the frontends to build.
@ -72,7 +71,6 @@ preConfigure() {
}
postInstall=postInstall
postInstall() {
# Remove precompiled headers for now. They are very big and
# probably not very useful yet.

View file

@ -54,7 +54,6 @@ if test "$noSysDirs" = "1"; then
fi
preConfigure=preConfigure
preConfigure() {
# Perform the build in a different directory.
mkdir ../build
@ -63,7 +62,6 @@ preConfigure() {
}
postInstall=postInstall
postInstall() {
# Remove precompiled headers for now. They are very big and
# probably not very useful yet.

View file

@ -51,7 +51,6 @@ if test "$noSysDirs" = "1"; then
fi
preConfigure=preConfigure
preConfigure() {
# Perform the build in a different directory.
mkdir ../build
@ -60,7 +59,6 @@ preConfigure() {
}
postInstall=postInstall
postInstall() {
# Remove precompiled headers for now. They are very big and
# probably not very useful yet.

View file

@ -9,13 +9,11 @@ configureScript=./Configure
configureFlags="-de -Dcc=gcc -Dprefix=$out -Uinstallusrbinperl $extraflags"
dontAddPrefix=1
preBuild=preBuild
preBuild() {
# Make Cwd work on NixOS (where we don't have a /bin/pwd).
substituteInPlace lib/Cwd.pm --replace "'/bin/pwd'" "'$(type -tP pwd)'"
}
postInstall=postInstall
postInstall() {
ensureDir "$out/nix-support"
cp $setupHook $out/nix-support/setup-hook

View file

@ -32,18 +32,18 @@ stdenv.mkDerivation {
configureFlags = "--enable-shared";
preConfigure = "
preConfigure = ''
# Purity.
for i in /usr /sw /opt /pkg; do
substituteInPlace ./setup.py --replace $i /no-such-path
done
";
'';
setupHook = ./setup-hook.sh;
postInstall = "
ensureDir $out/nix-support
cp ${./setup-hook.sh} $out/nix-support/setup-hook
postInstall = ''
rm -rf $out/lib/python2.4/test
";
'';
passthru = {
inherit zlibSupport;

View file

@ -53,20 +53,20 @@ stdenv.mkDerivation {
configureFlags = "--enable-shared --with-wctype-functions";
preConfigure = "
preConfigure = ''
# Purity.
for i in /usr /sw /opt /pkg; do
substituteInPlace ./setup.py --replace $i /no-such-path
done
" + (if readline != null then ''
'' + (if readline != null then ''
export NIX_LDFLAGS="$NIX_LDFLAGS -lncurses"
'' else "");
setupHook = ./setup-hook.sh;
postInstall = "
ensureDir $out/nix-support
cp ${./setup-hook.sh} $out/nix-support/setup-hook
postInstall = ''
rm -rf $out/lib/python2.5/test
";
'';
passthru = {
inherit zlibSupport;

View file

@ -1,16 +0,0 @@
source $stdenv/setup
preConfigure() {
cd unix
}
preConfigure=preConfigure
postInstall() {
make install-private-headers
ln -s $out/bin/tclsh8.4 $out/bin/tclsh
}
postInstall=postInstall
genericBuild

View file

@ -2,11 +2,19 @@
stdenv.mkDerivation {
name = "tcl-8.4.18";
builder = ./builder.sh;
src = fetchurl {
url = mirror://sourceforge/tcl/tcl8.4.18-src.tar.gz;
sha256 = "197h3m2lc5a6famc683zhjp55774gf8zwggfy2893v48lp5p7qny";
};
preConfigure = "cd unix";
postInstall = ''
make install-private-headers
ln -s $out/bin/tclsh8.4 $out/bin/tclsh
'';
meta = {
description = "The Tcl scription language";
homepage = http://www.tcl.tk/;

View file

@ -1,13 +1,11 @@
source $stdenv/setup
configurePhase=configurePhase
configurePhase() {
cd lib/Xaw3d
(mkdir X11 && cd X11 && ln -fs .. Xaw3d)
xmkmf
}
buildPhase=buildPhase
buildPhase() {
make depend $makeFlags
make $makeFlags
@ -23,4 +21,4 @@ installPhase() {
makeFlags="CDEBUGFLAGS=" # !!! awful hack
genericBuild
genericBuild

View file

@ -5,13 +5,9 @@ preConfigure() {
cp $dicts cracklib-dicts/
}
preConfigure=preConfigure
postInstall() {
$out/sbin/cracklib-format cracklib-dicts/* | $out/sbin/cracklib-packer cracklib_dict
cp cracklib_dict.* $out/lib
}
postInstall=postInstall
genericBuild

View file

@ -4,11 +4,9 @@ preConfigure() {
cd build_unix
configureScript=../dist/configure
}
preConfigure=preConfigure
postInstall() {
rm -rf $out/docs
}
postInstall=postInstall
genericBuild

View file

@ -1,8 +1,10 @@
{stdenv, fetchurl, cxxSupport ? true, compat185 ? true}:
stdenv.mkDerivation ({
stdenv.mkDerivation {
name = "db4-4.4.20";
builder = ./builder.sh;
src = fetchurl {
urls = [
http://download.oracle.com/berkeley-db/db-4.4.20.NC.tar.gz
@ -10,8 +12,11 @@ stdenv.mkDerivation ({
];
md5 = "afd9243ea353bbaa04421488d3b37900";
};
configureFlags = [
(if cxxSupport then "--enable-cxx" else "--disable-cxx")
(if compat185 then "--enable-compat185" else "--disable-compat185")
];
} // (if stdenv.system == "i686-cygwin" then {patches = [./cygwin-4.4.patch];} else {}))
patches = [ ./cygwin-4.4.patch ];
}

View file

@ -2,14 +2,18 @@
stdenv.mkDerivation {
name = "db4-4.5.20";
builder = ./builder.sh;
src = fetchurl {
url = http://download-east.oracle.com/berkeley-db/db-4.5.20.tar.gz;
md5 = "b0f1c777708cb8e9d37fb47e7ed3312d";
};
configureFlags = [
(if cxxSupport then "--enable-cxx" else "--disable-cxx")
(if compat185 then "--enable-compat185" else "--disable-compat185")
];
patches = [./cygwin-4.5.patch ./register-race-fix.patch];
}

View file

@ -8,7 +8,6 @@ source $stdenv/setup
export PWD_P=$(type -tP pwd)
postUnpack=postUnpack
postUnpack() {
cd $sourceRoot
unpackFile $linuxthreadsSrc
@ -16,7 +15,6 @@ postUnpack() {
}
preConfigure=preConfigure
preConfigure() {
# Use Linuxthreads instead of NPTL.
@ -34,7 +32,6 @@ preConfigure() {
}
postConfigure=postConfigure
postConfigure() {
# Hack: get rid of the `-static' flag set by the bootstrap stdenv.
# This has to be done *after* `configure' because it builds some
@ -44,7 +41,6 @@ postConfigure() {
}
postInstall=postInstall
postInstall() {
if test -n "$installLocales"; then
make localedata/install-locales

View file

@ -11,7 +11,6 @@ export PWD_P=$(type -tP pwd)
export BASH_SHELL=$SHELL
preConfigure=preConfigure
preConfigure() {
for i in configure io/ftwtest-sh; do
@ -34,7 +33,6 @@ preConfigure() {
}
postConfigure=postConfigure
postConfigure() {
# Hack: get rid of the `-static' flag set by the bootstrap stdenv.
# This has to be done *after* `configure' because it builds some
@ -44,7 +42,6 @@ postConfigure() {
}
postInstall=postInstall
postInstall() {
if test -n "$installLocales"; then
make localedata/install-locales

View file

@ -1,6 +1,5 @@
source $stdenv/setup
preConfigure=preConfigure
preConfigure() {
# Workarounds for the ancient libtool shipped by libjpeg.
ln -s $libtool/bin/libtool .
@ -8,7 +7,6 @@ preConfigure() {
cp $libtool/share/libtool/config.sub .
}
preInstall=preInstall
preInstall() {
mkdir $out
mkdir $out/bin
@ -18,7 +16,6 @@ preInstall() {
mkdir $out/man/man1
}
patchPhase=patchPhase
patchPhase() {
for i in $patches; do
patch < $i

View file

@ -1,10 +1,6 @@
source $stdenv/setup
ensureDir $out/nix-support
substitute "$hook" "$out/nix-support/setup-hook" --subst-var out
preConfigure=preConfigure
preConfigure() {
# Patch some of the configure files a bit to get of global paths.
@ -30,7 +26,6 @@ configureScript() {
}
postInstall=postInstall
postInstall() {
# Qt's `make install' is broken; it copies ./bin/qmake, which
# is a symlink to ./qmake/qmake. So we end up with a dangling

View file

@ -21,7 +21,9 @@ stdenv.mkDerivation {
name = "qt-3.3.8";
builder = ./builder.sh;
hook = ./setup-hook.sh;
setupHook = ./setup-hook.sh;
src = fetchurl {
url = ftp://ftp.trolltech.com/qt/source/qt-x11-free-3.3.8.tar.bz2;
sha256 = "0jd4g3bwkgk2s4flbmgisyihm7cam964gzb3pawjlkhas01zghz8";

View file

@ -6,16 +6,13 @@ configurePhase() {
--replace "/usr/local/lib" "$sqlite/lib"
cp setup.cfg /tmp
}
configurePhase=configurePhase
buildPhase() {
$python/bin/python setup.py build
}
buildPhase=buildPhase
installPhase() {
$python/bin/python setup.py install --prefix=$out
}
installPhase=installPhase
genericBuild

View file

@ -5,16 +5,13 @@ flags="WXPORT=gtk2 NO_HEADERS=1 BUILD_GLCANVAS=0 BUILD_OGL=0 UNICODE=1"
configurePhase() {
cd wxPython
}
configurePhase=configurePhase
buildPhase() {
python setup.py $flags build
}
buildPhase=buildPhase
installPhase() {
python setup.py $flags install --prefix=$out
}
installPhase=installPhase
genericBuild
genericBuild

View file

@ -2,16 +2,14 @@ source $stdenv/setup
set -e
configurePhase=configurePhase
configurePhase() {
tar zxvf $src
cd jikespg/src
}
installPhase=installPhase
installPhase() {
ensureDir $out/bin
cp jikespg $out/bin
}
genericBuild
genericBuild

View file

@ -1,6 +1,5 @@
source $stdenv/setup
postInstall=postInstall
postInstall() {
ensureDir $out/share/exult/music
for i in $musicFiles; do

View file

@ -1,12 +0,0 @@
source $stdenv/setup
export installFlags="PREFIX=$out"
preBuild() {
cp $config .config
make include/bb_config.h
}
preBuild=preBuild
genericBuild

View file

@ -2,7 +2,6 @@
stdenv.mkDerivation {
name = "busybox-1.2.2.1";
builder = ./builder.sh;
src = fetchurl {
url = http://busybox.net/downloads/busybox-1.2.2.1.tar.bz2;
@ -10,7 +9,13 @@ stdenv.mkDerivation {
};
# inherit gccCross;
# buildinputs = [binutilsCross];
# fixme, need a decent config for MIPS or so
config = ./x86-config-1.2;
preBuild = ''
installFlags="PREFIX=$out"
cp ${./x86-config-1.2} .config
make include/bb_config.h
'';
}

View file

@ -1,11 +1,9 @@
source $stdenv/setup
preConfigure=preConfigure
preConfigure() {
cd src
}
postInstall=postInstall
postInstall() {
romsDir=$out/share/atari800/roms
ensureDir $romsDir

View file

@ -1,6 +1,5 @@
source $stdenv/setup
preConfigure=preConfigure
preConfigure() {
# "ijs" is impure: it contains symlinks to /usr/share/automake etc.!
rm -rf ijs/ltmain.sh
@ -11,7 +10,6 @@ preConfigure() {
installTargets="install install-so install-data install-doc install-man"
postInstall=postInstall
postInstall() {
for i in $fonts; do
(cd $out/share/ghostscript && tar xvfz $i)

View file

@ -1,12 +0,0 @@
source $stdenv/setup
postInstall() {
if test -n "$udevSupport"; then
ensureDir $out/etc/udev/rules.d
cp $udevRules $out/etc/udev/rules.d/10-wacom.rules
fi
}
postInstall=postInstall
genericBuild

View file

@ -2,12 +2,18 @@
stdenv.mkDerivation {
name = "linuxwacom-0.7.2";
builder = ./builder.sh;
src = fetchurl {
url = http://nixos.org/tarballs/linuxwacom-0.7.2.tar.bz2;
md5 = "3f6290101d5712a24097243ca9f092ed";
};
buildInputs = [libX11 libXi];
udevRules = ./10-wacom.rules;
inherit udevSupport;
postInstall = ''
if test -n "${toString udevSupport}"; then
ensureDir $out/etc/udev/rules.d
cp ${./10-wacom.rules} $out/etc/udev/rules.d/10-wacom.rules
fi
'';
}

View file

@ -1,12 +0,0 @@
source $stdenv/setup
postInstall() {
if test "$udevSupport" = "1" ; then
ensureDir $out/etc/udev/rules.d/
cp tools/udev/libsane.rules $out/etc/udev/rules.d/60-libsane.rules
fi
}
postInstall=postInstall
genericBuild

View file

@ -5,17 +5,27 @@ assert hotplugSupport -> stdenv.system == "i686-linux";
stdenv.mkDerivation {
name = "sane-backends-1.0.18";
builder = ./builder.sh;
src = fetchurl {
url = ftp://ftp.sane-project.org/pub/sane/sane-backends-1.0.18/sane-backends-1.0.18.tar.gz;
md5 = "7ca7e2908e24721471de92cf40c75e60";
};
udevSupport = hotplugSupport;
buildInputs = (if libusb != null then [libusb] else []);
buildInputs = if libusb != null then [libusb] else [];
preInstall = (if gt68xxFirmware != null then
"mkdir -p \${out}/share/sane/gt68xx ; ln -s " +
(gt68xxFirmware {inherit fetchurl;})+ " \${out}/share/sane/gt68xx/PS1fw.usb "
else "");
postInstall = ''
if test "$udevSupport" = "1"; then
ensureDir $out/etc/udev/rules.d/
cp tools/udev/libsane.rules $out/etc/udev/rules.d/60-libsane.rules
fi
'';
preInstall =
if gt68xxFirmware != null then
"mkdir -p \${out}/share/sane/gt68xx ; ln -s " +
(gt68xxFirmware {inherit fetchurl;}) +
" \${out}/share/sane/gt68xx/PS1fw.usb "
else "";
}

View file

@ -19,10 +19,4 @@ configureFlags="\
--with-system-ncurses \
"
postInstall() {
ensureDir "$out/nix-support"
cp $setupHook $out/nix-support/setup-hook
}
postInstall=postInstall
genericBuild

View file

@ -3,7 +3,6 @@ source $stdenv/setup
makeFlags="prefix=$out"
installFlags="prefix=$out"
postInstall=postInstall
postInstall() {
(cd $out && ln -s lib-* lib)
(cd $out/lib && ln -s start.o crt1.o)

View file

@ -1,20 +0,0 @@
source $stdenv/setup
export ROOT=$out
buildPhase() {
cd src
make
}
buildPhase=buildPhase
installPhase() {
make install
cd ..; cp -af rc.d sysconfig ppp $ROOT/etc
}
installPhase=installPhase
genericBuild

View file

@ -1,12 +0,0 @@
{stdenv, fetchurl, popt, pkgconfig, glib}:
stdenv.mkDerivation {
name = "initscripts-8.18";
builder = ./builder.sh;
src = fetchurl {
url = http://nixos.org/tarballs/initscripts-8.18.tar.bz2;
md5 = "1b89ac4d344f1f20fe5022a198b69915";
};
buildInputs = [popt pkgconfig glib];
patches = [./initscripts-8.18.patch];
}

View file

@ -1,49 +0,0 @@
diff -ruN initscripts-8.18/src/Makefile initscripts-8.18.new/src/Makefile
--- initscripts-8.18/src/Makefile 2005-03-31 22:52:04.000000000 +0200
+++ initscripts-8.18.new/src/Makefile 2005-12-12 17:54:14.000000000 +0100
@@ -1,12 +1,13 @@
CFLAGS+=$(RPM_OPT_FLAGS) -Wall -D_GNU_SOURCE
PROGS=usernetctl doexec netreport testd usleep ipcalc initlog \
- getkey ppp-watch consoletype genhostid kmodule
+ getkey consoletype genhostid
+ #getkey ppp-watch consoletype genhostid kmodule
PPPWATCH_OBJS=ppp-watch.o shvar.o
INITLOG_OBJS=initlog.o process.o
USLEEP_OBJS=usleep.o
-mandir=/usr/share/man
+mandir=
all: $(PROGS)
@@ -14,9 +15,9 @@
rm -f $(PROGS) *.o
install:
- mkdir -p $(ROOT)/bin $(ROOT)/usr/sbin $(ROOT)$(mandir)/man{1,8} $(ROOT)/etc
+ mkdir -p $(ROOT)/bin $(ROOT)/sbin $(ROOT)/usr/sbin $(ROOT)$(mandir)/man{1,8} $(ROOT)/etc
install -m 755 doexec $(ROOT)/bin/doexec
- install -m 755 kmodule $(ROOT)/sbin/kmodule
+ #install -m 755 kmodule $(ROOT)/sbin/kmodule
install -m 755 usleep $(ROOT)/bin/usleep
install -m 4755 usernetctl $(ROOT)/usr/sbin/usernetctl
install -m 2755 netreport $(ROOT)/sbin/netreport
@@ -24,7 +25,7 @@
install -m 755 genhostid $(ROOT)/sbin/genhostid
install -m 755 initlog $(ROOT)/sbin/initlog
install -m 755 getkey $(ROOT)/sbin/getkey
- install -m 755 ppp-watch $(ROOT)/sbin/ppp-watch
+ #install -m 755 ppp-watch $(ROOT)/sbin/ppp-watch
install -m 755 consoletype $(ROOT)/sbin/consoletype
install -m 644 initlog.1 $(ROOT)$(mandir)/man1
install -m 644 genhostid.1 $(ROOT)$(mandir)/man1
@@ -32,7 +33,7 @@
install -m 644 netreport.1 $(ROOT)$(mandir)/man1
install -m 644 usleep.1 $(ROOT)$(mandir)/man1
install -m 644 usernetctl.8 $(ROOT)$(mandir)/man8
- install -m 644 ppp-watch.8 $(ROOT)$(mandir)/man8
+ #install -m 644 ppp-watch.8 $(ROOT)$(mandir)/man8
install -m 644 ipcalc.1 $(ROOT)$(mandir)/man1
install -m 644 consoletype.1 $(ROOT)$(mandir)/man1
install -m 644 initlog.conf $(ROOT)/etc

View file

@ -5,8 +5,6 @@ buildPhase() {
make include/linux/version.h
}
buildPhase=buildPhase
installPhase() {
mkdir $out
@ -29,7 +27,5 @@ installPhase() {
echo -n > $out/include/linux/autoconf.h
}
installPhase=installPhase
genericBuild

View file

@ -1,7 +1,6 @@
source $stdenv/setup
configurePhase=configurePhase
configurePhase() {
if test -n "$preConfigure"; then
eval "$preConfigure";
@ -56,7 +55,6 @@ configurePhase() {
}
installPhase=installPhase
installPhase() {
ensureDir $out

View file

@ -1,6 +1,5 @@
source $stdenv/setup
preBuild=preBuild
preBuild() {
mkdir -p linux/include
cp -prd $kernel/lib/modules/*/build/include/* linux/include/

View file

@ -10,6 +10,4 @@ preInstall() {
make install-program
}
preInstall=preInstall
genericBuild

View file

@ -1,17 +0,0 @@
source $stdenv/setup
preBuild() {
cd squashfs-tools
}
preBuild=preBuild
installPhase() {
ensureDir $out/sbin
cp mksquashfs $out/sbin
cp unsquashfs $out/sbin
}
installPhase=installPhase
genericBuild

View file

@ -2,10 +2,21 @@
stdenv.mkDerivation {
name = "squashfs-3.3";
builder = ./builder.sh;
src = fetchurl {
url = mirror://sourceforge/squashfs/squashfs3.3.tgz;
sha256 = "1j55m26nyvlbld4yxad0r6s1f4rdw9yg89y2gv93ihkx3rx048w4";
};
buildInputs = [zlib];
preBuild = ''
cd squashfs-tools
'';
installPhase = ''
ensureDir $out/sbin
cp mksquashfs $out/sbin
cp unsquashfs $out/sbin
'';
}

View file

@ -4,7 +4,6 @@ makeFlagsArray=(LCRYPT=-lcrypt BIN_OWNER=$(id -u) BIN_GROUP=$(id -g) ROOT=$out)
preBuild="cd src"
preInstall=preInstall
preInstall() {
substituteInPlace Makefile --replace /usr /
mkdir $out
@ -18,7 +17,6 @@ preInstall() {
mkdir $out/share/man/man8
}
postInstall=postInstall
postInstall() {
if test -n "$withoutInitTools"; then
mv $out/sbin/killall5 $out/bin

View file

@ -1,4 +1,3 @@
preInstall=preInstall
preInstall() {
ensureDir $out/lib/X11/config
ln -s $xorgcffiles/lib/X11/config/* $out/lib/X11/config

View file

@ -3,7 +3,6 @@
# NixOS, so force Make to search in our own Glibc.
export VPATH=$(cat ${NIX_GCC}/nix-support/orig-libc)/lib
preConfigure=preConfigure
preConfigure() {
unpackFile $mesaSrc
configureFlags="$configureFlags --with-mesa-source=$(ls -d $(pwd)/Mesa-*)"

View file

@ -1,6 +1,5 @@
source $stdenv/setup
buildPhase=buildPhase
buildPhase() {
xmkmf
make World
@ -18,7 +17,6 @@ buildPhase() {
cd ..
}
installPhase=installPhase
installPhase() {
ensureDir $out/bin
ensureDir $out/man/man1

View file

@ -1,14 +0,0 @@
source $stdenv/setup
builder() {
make -f unix/Makefile generic
}
installer() {
make -f unix/Makefile prefix=$out install
}
buildPhase=builder
installPhase=installer
genericBuild

View file

@ -2,13 +2,17 @@
stdenv.mkDerivation {
name = "unzip-5.52";
builder = ./builder.sh;
src = fetchurl {
url = http://nixos.org/tarballs/unzip552.tar.gz;
md5 = "9d23919999d6eac9217d1f41472034a9";
};
buildPhase = "make -f unix/Makefile generic";
installPhase = "make -f unix/Makefile prefix=$out install";
meta = {
homepage = http://www.info-zip.org;
homepage = http://www.info-zip.org;
};
}

View file

@ -1,6 +1,5 @@
source $stdenv/setup
installPhase=installPhase
installPhase() {
ensureDir $out/bin
cp -p zdc zdu $out/bin

View file

@ -4,14 +4,10 @@ preBuild() {
cd src
}
preBuild=preBuild
preInstall() {
ensureDir $out/bin
}
preInstall=preInstall
postInstall() {
# Install the "prefabs".
ensureDir $out/share/ploticus/prefabs && \
@ -34,7 +30,4 @@ EOF
ln -s "$out/man/man1/pl.1" "$out/man/man1/ploticus.1"
}
postInstall=postInstall
genericBuild

View file

@ -1,6 +1,5 @@
source $stdenv/setup
patchPhase=patchPhase
patchPhase() {
for i in $patches; do
header "applying patch $i" 3
@ -25,14 +24,12 @@ configureImakefiles() {
cp tmpsed transfig/Imakefile
}
buildPhase=buildPhase
buildPhase() {
xmkmf
make Makefiles
make
}
preInstall=preInstall
preInstall() {
ensureDir $out
ensureDir $out/lib

View file

@ -9,7 +9,6 @@ makeFlagsArray=(CLIENT_PATH='\"FAKE_PATH=/nothing\"' \
LIBDIR=$out/lib INCDIR=$out/include VARDB=$OUT/var/run \
)
configurePhase=configurePhase
configurePhase() {
# Patch the header that contains absolute paths to the tools.
sed -i "includes/dhcpd.h" \
@ -18,7 +17,6 @@ configurePhase() {
./configure
}
preBuild=preBuild
preBuild() {
substituteInPlace client/scripts/linux --replace /bin/bash $shell
}

View file

@ -1,6 +1,5 @@
source $stdenv/setup
preConfigure=preConfigure
preConfigure() {
if test -n "$idea"; then
gunzip < $idea > ./cipher/idea.c

View file

@ -4615,11 +4615,6 @@ let
inherit fetchurl stdenv pkgconfig libdaemon;
};
initscripts = import ../os-specific/linux/initscripts {
inherit fetchurl stdenv popt pkgconfig;
inherit (gtkLibs) glib;
};
iproute = import ../os-specific/linux/iproute {
inherit fetchurl stdenv flex bison db4;
};