about summary refs log tree commit diff
diff options
context:
space:
mode:
authorArmijn Hemel <armijn@gpl-violations.org>2005-08-27 23:05:50 +0000
committerArmijn Hemel <armijn@gpl-violations.org>2005-08-27 23:05:50 +0000
commit981a1f0f6ee4b6c57c8d839d94ae6142a2dd4652 (patch)
treeb60215b03754a15779c46d59e6d5fc73e46b5d82
parentef60b29c05d225b526fe39862e4b6933758d80cb (diff)
downloadnixlib-981a1f0f6ee4b6c57c8d839d94ae6142a2dd4652.tar
nixlib-981a1f0f6ee4b6c57c8d839d94ae6142a2dd4652.tar.gz
nixlib-981a1f0f6ee4b6c57c8d839d94ae6142a2dd4652.tar.bz2
nixlib-981a1f0f6ee4b6c57c8d839d94ae6142a2dd4652.tar.lz
nixlib-981a1f0f6ee4b6c57c8d839d94ae6142a2dd4652.tar.xz
nixlib-981a1f0f6ee4b6c57c8d839d94ae6142a2dd4652.tar.zst
nixlib-981a1f0f6ee4b6c57c8d839d94ae6142a2dd4652.zip
add dietlibc
svn path=/nixpkgs/trunk/; revision=3729
-rw-r--r--pkgs/os-specific/linux/dietlibc/builder.sh11
-rw-r--r--pkgs/os-specific/linux/dietlibc/default.nix12
-rw-r--r--pkgs/os-specific/linux/dietlibc/dietlibc-install.patch10
-rw-r--r--pkgs/system/all-packages-generic.nix4
4 files changed, 37 insertions, 0 deletions
diff --git a/pkgs/os-specific/linux/dietlibc/builder.sh b/pkgs/os-specific/linux/dietlibc/builder.sh
new file mode 100644
index 000000000000..a8daa6c09cf3
--- /dev/null
+++ b/pkgs/os-specific/linux/dietlibc/builder.sh
@@ -0,0 +1,11 @@
+. $stdenv/setup
+
+preBuild() {
+  kernelhash=$(ls $kernel/lib/modules)
+  echo $kernelhash
+  ln -s $kernel/lib/modules/$kernelhash/build linux
+}
+
+preBuild=preBuild
+
+genericBuild
diff --git a/pkgs/os-specific/linux/dietlibc/default.nix b/pkgs/os-specific/linux/dietlibc/default.nix
new file mode 100644
index 000000000000..434aabe0193c
--- /dev/null
+++ b/pkgs/os-specific/linux/dietlibc/default.nix
@@ -0,0 +1,12 @@
+{stdenv, fetchurl}:
+
+assert stdenv.system == "i686-linux";
+
+stdenv.mkDerivation {
+  name = "dietlibc-0.29";
+  src = fetchurl {
+    url = http://www.kernel.org/pub/linux/libs/dietlibc/dietlibc-0.29.tar.bz2;
+    md5 = "16d31dd7b5f9124e8ea8280c3f646e13";
+  };
+  patches = [./dietlibc-install.patch];
+}
diff --git a/pkgs/os-specific/linux/dietlibc/dietlibc-install.patch b/pkgs/os-specific/linux/dietlibc/dietlibc-install.patch
new file mode 100644
index 000000000000..d8a428c3c308
--- /dev/null
+++ b/pkgs/os-specific/linux/dietlibc/dietlibc-install.patch
@@ -0,0 +1,10 @@
+diff -ruN dietlibc-0.29/Makefile dietlibc-0.29.new/Makefile
+--- dietlibc-0.29/Makefile	2005-05-18 16:38:55.000000000 +0200
++++ dietlibc-0.29.new/Makefile	2005-08-28 01:02:50.000000000 +0200
+@@ -1,5 +1,5 @@
+ INSTALL=install
+-prefix?=/opt/diet
++prefix?=${out}
+ # Set the following to install to a different root
+ #DESTDIR=/tmp/fefix
+ # Use "make DEBUG=1" to compile a debug version.
diff --git a/pkgs/system/all-packages-generic.nix b/pkgs/system/all-packages-generic.nix
index b13bcbad01cc..87b1e3886293 100644
--- a/pkgs/system/all-packages-generic.nix
+++ b/pkgs/system/all-packages-generic.nix
@@ -1089,6 +1089,10 @@ rec {
   
   ### OS-SPECIFIC
 
+  dietlibc = (import ../os-specific/linux/dietlibc) {
+    inherit fetchurl stdenv;
+  };
+
   hwdata = (import ../os-specific/linux/hwdata) {
     inherit fetchurl stdenv;
   };