JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

* Splashutils.

Browse Source 
svn path=/nixpkgs/trunk/; revision=7126
This commit is contained in:
Eelco Dolstra 2006-11-25 00:28:15 +00:00
parent 53d285263f
commit 491f505848
4 changed files with 78 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
pkgs/os-specific/linux/klibc/default.nix
View File

@ -1,15 +1,15 @@
{stdenv, fetchurl, kernel, perl, bison, flexWrapper}:
assert stdenv.system == "i686-linux";
assert stdenv.isLinux;
stdenv.mkDerivation {
name = "klibc-1.0";
name = "klibc-1.4";
builder = ./builder.sh;
src = fetchurl {
url = http://nix.cs.uu.nl/dist/tarballs/klibc-1.0.tar.bz2;
md5 = "daaa233fb7905cbe110896fcad9bec7f";
url = http://www.kernel.org/pub/linux/libs/klibc/klibc-1.4.tar.bz2;
md5 = "f4e0e17fc660e59c39e448fe1d827d36";
};
inherit kernel;
buildInputs = [perl bison flexWrapper];
patches = [./klibc-installpath.patch];
# buildInputs = [perl bison flexWrapper];
# patches = [./klibc-installpath.patch];
}

20
pkgs/os-specific/linux/splashutils/default.nix Normal file
View File

@ -0,0 +1,20 @@
{stdenv, fetchurl}:
stdenv.mkDerivation {
name = "splashutils-1.3";
src = fetchurl {
url = http://dev.gentoo.org/~spock/projects/splashutils/archive/splashutils-1.3.tar.bz2;
md5 = "c7c92b98e34b860511aa57bd29d62f76";
};
patches = [./no-fbsplash.patch];
dontAddPrefix = 1;
configureFlags = "--without-ttf --without-png --without-fbsplash";
# Hack hack hack.
makeFlags = "KLCC=gcc";
NIX_CFLAGS_COMPILE = "-Iobjs/jpeglib -Ilibs/jpeg-6b -Ilibs/freetype-2.1.9/include -Ilibs/libpng-1.2.8 -Ilibs/zlib-1.2.3";
NIX_CFLAGS_LINK = "-Lobjs/jpeglib -Lobjs/freetype2/.libs -Llibs/zlib-1.2.3 -Llibs/libpng-1.2.8";
installPhase = "ensureDir $out/bin; cp objs/splash_helper objs/splash_util objs/splash_util.static $out/bin";
}

48
pkgs/os-specific/linux/splashutils/no-fbsplash.patch Normal file
View File

@ -0,0 +1,48 @@
diff -rc splashutils-1.3-orig/Makefile splashutils-1.3/Makefile
*** splashutils-1.3-orig/Makefile 2006-07-15 00:02:22.000000000 +0200
--- splashutils-1.3/Makefile 2006-11-25 01:22:03.000000000 +0100
***************
*** 57,63 ****
PNGDEFS = -DPNG_NO_WRITE_TIME -DPNG_NO_FLOATING_POINT_SUPPORTED -DPNG_NO_WRITE_SUPPORTED -DPNG_NO_READ_iTXt \
-DPNG_LEGACY_SUPPORTED -DPNG_NO_PROGRESSIVE_READ -DPNG_NO_MNG_FEATURES -DPNG_NO_CONSOLE_IO \
-DPNG_NO_ERROR_NUMBERS -DPNG_READ_GRAY_TO_RGB_SUPPORTED -DPNG_READ_16_TO_8_SUPPORTED \
! -DPNG_READ_STRIP_ALPHA_SUPPORTED -DPNG_NO_INFO_IMAGE -DPNG_NO_READ_TRANSFORMS -DPNG_NO_READ_ANCILLARY_CHUNKS
K_LDLIBS = $(OBJDIR)/jpeglib/libjpeg.a
K_OBJS = $(KOUT)/kernel.o $(KOUT)/dev.o $(KOUT)/parse.o $(KOUT)/render.o $(KOUT)/image.o \
--- 57,63 ----
PNGDEFS = -DPNG_NO_WRITE_TIME -DPNG_NO_FLOATING_POINT_SUPPORTED -DPNG_NO_WRITE_SUPPORTED -DPNG_NO_READ_iTXt \
-DPNG_LEGACY_SUPPORTED -DPNG_NO_PROGRESSIVE_READ -DPNG_NO_MNG_FEATURES -DPNG_NO_CONSOLE_IO \
-DPNG_NO_ERROR_NUMBERS -DPNG_READ_GRAY_TO_RGB_SUPPORTED -DPNG_READ_16_TO_8_SUPPORTED \
! -DPNG_READ_STRIP_ALPHA_SUPPORTED -DPNG_NO_INFO_IMAGE -DPNG_NO_READ_ANCILLARY_CHUNKS
K_LDLIBS = $(OBJDIR)/jpeglib/libjpeg.a
K_OBJS = $(KOUT)/kernel.o $(KOUT)/dev.o $(KOUT)/parse.o $(KOUT)/render.o $(KOUT)/image.o \
Only in splashutils-1.3/: Makefile~
diff -rc splashutils-1.3-orig/splash.h splashutils-1.3/splash.h
*** splashutils-1.3-orig/splash.h 2006-07-15 00:02:23.000000000 +0200
--- splashutils-1.3/splash.h 2006-11-25 00:42:08.000000000 +0100
***************
*** 21,30 ****
*/
#ifdef TARGET_KERNEL
#include <linux/fb.h>
! #include <linux/console_splash.h>
#else
! #include <fb.h>
! #include <console_splash.h>
#endif
/*
--- 21,30 ----
*/
#ifdef TARGET_KERNEL
#include <linux/fb.h>
! //#include <linux/console_splash.h>
#else
! #include <linux/fb.h>
! //#include <console_splash.h>
#endif
/*
Only in splashutils-1.3/: splash.h~

4
pkgs/top-level/all-packages.nix
View File

@ -2181,6 +2181,10 @@ rec {
inherit fetchurl stdenv;
};
splashutils = import ../os-specific/linux/splashutils {
inherit fetchurl stdenv;
};
squashfsTools = import ../os-specific/linux/squashfs {
inherit fetchurl stdenv zlib;
};