3.20 needs different patch

svn path=/nixpkgs/trunk/; revision=6298
This commit is contained in:
Armijn Hemel 2006-08-28 21:53:39 +00:00
parent 9b3c21b9a4
commit e142de356a
3 changed files with 41 additions and 1 deletions

View File

@ -4,7 +4,7 @@ stdenv.mkDerivation {
name = "syslinux-3.11";
builder = ./builder.sh;
src = fetchurl {
url = http://www.kernel.org/pub/linux/utils/boot/syslinux/Old/syslinux-3.11.tar.bz2;
url = http://www.kernel.org/pub/linux/utils/boot/syslinux/syslinux-3.11.tar.bz2;
md5 = "513ff71287a4397d507879a1a836c2e8";
};
buildInputs = [nasm perl];

View File

@ -0,0 +1,28 @@
diff -rc syslinux-3.20/Makefile syslinux-3.20.new/Makefile
*** syslinux-3.20/Makefile 2006-08-26 19:32:12.000000000 +0200
--- syslinux-3.20.new/Makefile 2006-08-28 23:48:18.000000000 +0200
***************
*** 25,35 ****
NASM = nasm -O99
NINCLUDE =
! BINDIR = /usr/bin
! SBINDIR = /sbin
! LIBDIR = /usr/lib
AUXDIR = $(LIBDIR)/syslinux
! INCDIR = /usr/include
PERL = perl
--- 25,35 ----
NASM = nasm -O99
NINCLUDE =
! BINDIR = $(out)/bin
! SBINDIR = $(out)/sbin
! LIBDIR = $(out)/lib
AUXDIR = $(LIBDIR)/syslinux
! INCDIR = $(out)/include
PERL = perl

View File

@ -0,0 +1,12 @@
{stdenv, fetchurl, nasm, perl}:
stdenv.mkDerivation {
name = "syslinux-3.20";
builder = ./builder.sh;
src = fetchurl {
url = http://www.kernel.org/pub/linux/utils/boot/syslinux/syslinux-3.20.tar.bz2;
md5 = "0701e0de1de6d31bdd889384b041e5b7";
};
buildInputs = [nasm perl];
patches = [./syslinux-3.20-installpath.patch];
}