diff options
| author | Armijn Hemel <armijn@gpl-violations.org> | 2006-08-28 21:53:39 +0000 |
|---|---|---|
| committer | Armijn Hemel <armijn@gpl-violations.org> | 2006-08-28 21:53:39 +0000 |
| commit | e142de356ae9ff3a7353f1543e047e627241459a (patch) | |
| tree | fd93875afd5d2a3003cad8ed536c5b24d3f62156 /pkgs/os-specific/linux/syslinux | |
| parent | 9b3c21b9a4ea85040f9689596661cc424050d41f (diff) | |
| download | nixlib-e142de356ae9ff3a7353f1543e047e627241459a.tar nixlib-e142de356ae9ff3a7353f1543e047e627241459a.tar.gz nixlib-e142de356ae9ff3a7353f1543e047e627241459a.tar.bz2 nixlib-e142de356ae9ff3a7353f1543e047e627241459a.tar.lz nixlib-e142de356ae9ff3a7353f1543e047e627241459a.tar.xz nixlib-e142de356ae9ff3a7353f1543e047e627241459a.tar.zst nixlib-e142de356ae9ff3a7353f1543e047e627241459a.zip | |
3.20 needs different patch
svn path=/nixpkgs/trunk/; revision=6298
Diffstat (limited to 'pkgs/os-specific/linux/syslinux')
| -rw-r--r-- | pkgs/os-specific/linux/syslinux/syslinux-3.11.nix (renamed from pkgs/os-specific/linux/syslinux/default.nix) | 2 | ||||
| -rw-r--r-- | pkgs/os-specific/linux/syslinux/syslinux-3.20-installpath.patch | 28 | ||||
| -rw-r--r-- | pkgs/os-specific/linux/syslinux/syslinux-3.20.nix | 12 |
3 files changed, 41 insertions, 1 deletions
diff --git a/pkgs/os-specific/linux/syslinux/default.nix b/pkgs/os-specific/linux/syslinux/syslinux-3.11.nix index ef506726924a..e93d77b8d0f3 100644 --- a/pkgs/os-specific/linux/syslinux/default.nix +++ b/pkgs/os-specific/linux/syslinux/syslinux-3.11.nix @@ -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]; diff --git a/pkgs/os-specific/linux/syslinux/syslinux-3.20-installpath.patch b/pkgs/os-specific/linux/syslinux/syslinux-3.20-installpath.patch new file mode 100644 index 000000000000..ad69628cb5b4 --- /dev/null +++ b/pkgs/os-specific/linux/syslinux/syslinux-3.20-installpath.patch @@ -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 + diff --git a/pkgs/os-specific/linux/syslinux/syslinux-3.20.nix b/pkgs/os-specific/linux/syslinux/syslinux-3.20.nix new file mode 100644 index 000000000000..c84b416bc390 --- /dev/null +++ b/pkgs/os-specific/linux/syslinux/syslinux-3.20.nix @@ -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]; +} |