* Fix UML - poorly.
svn path=/nixpkgs/trunk/; revision=901
This commit is contained in:
parent
776554d9e1
commit
5c9232e063
|
@ -6,5 +6,7 @@
|
|||
directories for libraries (like setup.sh does now). [do we want
|
||||
this?]
|
||||
|
||||
* Bug in ld-wrapper: should source in add-flags (like gcc-wrapper) - then fix uml builder
|
||||
|
||||
|
||||
* Inform freedesktop people that Xaw requires Xpm.
|
|
@ -1,17 +1,38 @@
|
|||
buildinputs="$patch $perl $m4"
|
||||
. $stdenv/setup || exit 1
|
||||
. $stdenv/setup
|
||||
|
||||
tar xvfj $linuxSrc || exit 1
|
||||
cd linux-* || exit 1
|
||||
bunzip2 < $umlSrc | patch -p1 || exit 1
|
||||
cp $config .config || exit 1
|
||||
make oldconfig ARCH=um || exit 1
|
||||
# !!! hack
|
||||
. $NIX_GCC/nix-support/add-flags
|
||||
export NIX_LDFLAGS
|
||||
|
||||
make linux ARCH=um || exit 1
|
||||
strip linux || exit 1
|
||||
make modules ARCH=um || exit 1
|
||||
postUnpack() {
|
||||
unp() {
|
||||
bunzip2 < $umlPatch > patch
|
||||
}
|
||||
unpackCmd=unp
|
||||
unpackFile $umlPatch
|
||||
patches=`pwd`/patch
|
||||
}
|
||||
postUnpack=postUnpack
|
||||
|
||||
mkdir $out || exit 1
|
||||
mkdir $out/bin || exit 1
|
||||
cp -p linux $out/bin || exit 1
|
||||
make modules_install INSTALL_MOD_PATH=$out ARCH=um || exit 1
|
||||
configurePhase() {
|
||||
cp $config .config
|
||||
make oldconfig ARCH=um
|
||||
}
|
||||
configurePhase=configurePhase
|
||||
|
||||
buildPhase() {
|
||||
make linux ARCH=um
|
||||
strip linux
|
||||
make modules ARCH=um
|
||||
}
|
||||
buildPhase=buildPhase
|
||||
|
||||
installPhase() {
|
||||
mkdir $out
|
||||
mkdir $out/bin
|
||||
cp -p linux $out/bin
|
||||
make modules_install INSTALL_MOD_PATH=$out ARCH=um
|
||||
}
|
||||
installPhase=installPhase
|
||||
|
||||
genericBuild
|
||||
|
|
|
@ -5,14 +5,14 @@ assert patch != null && perl != null && m4 != null;
|
|||
stdenv.mkDerivation {
|
||||
name = "uml-2.4.22-3";
|
||||
builder = ./builder.sh;
|
||||
linuxSrc = fetchurl {
|
||||
src = fetchurl {
|
||||
url = ftp://ftp.nl.kernel.org/pub/linux/kernel/v2.4/linux-2.4.22.tar.bz2;
|
||||
md5 = "75dc85149b06ac9432106b8941eb9f7b";
|
||||
};
|
||||
umlSrc = fetchurl {
|
||||
umlPatch = fetchurl {
|
||||
url = http://uml-pub.ists.dartmouth.edu/uml/uml-patch-2.4.22-3.bz2;
|
||||
md5 = "1ffa698fed37d14c6750ec841b7d9858";
|
||||
};
|
||||
config = ./config;
|
||||
inherit patch perl m4;
|
||||
buildInputs = [patch perl m4];
|
||||
}
|
||||
|
|
|
@ -49,7 +49,7 @@ let {
|
|||
pkgs.gqview
|
||||
pkgs.hello
|
||||
pkgs.nxml
|
||||
pkgs.uml
|
||||
# pkgs.uml
|
||||
pkgs.nix
|
||||
];
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue