diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2007-02-06 22:08:13 +0000 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2007-02-06 22:08:13 +0000 |
| commit | 2fab5f01e3c1d92287e8ab2d2bd0fd47db856756 (patch) | |
| tree | 2a61b78d2c68c0a0da6d91ba3aef16f2ebb45fc4 /pkgs/os-specific/linux | |
| parent | b29ff1281b74fec74236cb88286daec53a626557 (diff) | |
| download | nixpkgs-2fab5f01e3c1d92287e8ab2d2bd0fd47db856756.tar nixpkgs-2fab5f01e3c1d92287e8ab2d2bd0fd47db856756.tar.gz nixpkgs-2fab5f01e3c1d92287e8ab2d2bd0fd47db856756.tar.bz2 nixpkgs-2fab5f01e3c1d92287e8ab2d2bd0fd47db856756.tar.lz nixpkgs-2fab5f01e3c1d92287e8ab2d2bd0fd47db856756.tar.xz nixpkgs-2fab5f01e3c1d92287e8ab2d2bd0fd47db856756.tar.zst nixpkgs-2fab5f01e3c1d92287e8ab2d2bd0fd47db856756.zip | |
* Borrowed a patch from Gentoo to get splashutils to work on x86_64.
* Latest klibc. svn path=/nixpkgs/trunk/; revision=7871
Diffstat (limited to 'pkgs/os-specific/linux')
| -rw-r--r-- | pkgs/os-specific/linux/klibc/default.nix | 6 | ||||
| -rw-r--r-- | pkgs/os-specific/linux/splashutils/default.nix | 7 | ||||
| -rw-r--r-- | pkgs/os-specific/linux/splashutils/fdset.patch | 20 |
3 files changed, 29 insertions, 4 deletions
diff --git a/pkgs/os-specific/linux/klibc/default.nix b/pkgs/os-specific/linux/klibc/default.nix index d016759e774..b410e845a59 100644 --- a/pkgs/os-specific/linux/klibc/default.nix +++ b/pkgs/os-specific/linux/klibc/default.nix @@ -3,11 +3,11 @@ assert stdenv.isLinux; stdenv.mkDerivation { - name = "klibc-1.4"; + name = "klibc-1.4.33"; builder = ./builder.sh; src = fetchurl { - url = http://www.kernel.org/pub/linux/libs/klibc/klibc-1.4.tar.bz2; - md5 = "f4e0e17fc660e59c39e448fe1d827d36"; + url = http://www.kernel.org/pub/linux/libs/klibc/Testing/klibc-1.4.33.tar.bz2; + sha256 = "1831bphb4z1x8vkhqmvxkb617pb4dixq33bm0nc6qrxrwix0ylag"; }; inherit kernel; buildInputs = [perl bison mktemp]; diff --git a/pkgs/os-specific/linux/splashutils/default.nix b/pkgs/os-specific/linux/splashutils/default.nix index 3c1f0efb835..ba38825c006 100644 --- a/pkgs/os-specific/linux/splashutils/default.nix +++ b/pkgs/os-specific/linux/splashutils/default.nix @@ -6,7 +6,12 @@ stdenv.mkDerivation { url = http://dev.gentoo.org/~spock/projects/splashutils/archive/splashutils-1.3.tar.bz2; md5 = "c7c92b98e34b860511aa57bd29d62f76"; }; - patches = [./purity.patch ./no-fbsplash.patch]; + patches = [ + ./purity.patch + ./no-fbsplash.patch + # Borrowed from http://sources.gentoo.org/viewcvs.py/*checkout*/gentoo-x86/media-gfx/splashutils/files/splashutils-1.3-fdset.patch?rev=1.1. + ./fdset.patch + ]; buildInputs = [klibc zlib libjpeg]; diff --git a/pkgs/os-specific/linux/splashutils/fdset.patch b/pkgs/os-specific/linux/splashutils/fdset.patch new file mode 100644 index 00000000000..44c61339c45 --- /dev/null +++ b/pkgs/os-specific/linux/splashutils/fdset.patch @@ -0,0 +1,20 @@ +diff --git a/core/render.c b/core/render.c +index 290ea97..47319a8 100644 +--- a/render.c ++++ b/render.c +@@ -9,8 +9,15 @@ + * + */ + ++/* ++ * HACK WARNING: ++ * This is necessary to get FD_SET and FD_ZERO on platforms other than x86. ++ */ ++ + #ifdef TARGET_KERNEL ++#define __KERNEL__ + #include <linux/posix_types.h> ++#undef __KERNEL__ + #endif + + #include <stdio.h> |