mirrors/nixpkgs
1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-24 22:50:49 +00:00
Code Issues Wiki Activity

* Fix some paths.

Browse source 
svn path=/nixpkgs/trunk/; revision=6974
This commit is contained in:
Eelco Dolstra 2006-11-07 21:13:57 +00:00
parent dab13a2af0
commit 986ec9c8a1
3 changed files with 2 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
pkgs/os-specific/linux/udev/default.nix
View file

@ -6,5 +6,6 @@ stdenv.mkDerivation {
url = http://www.us.kernel.org/pub/linux/utils/kernel/hotplug/udev-103.tar.bz2;
md5 = "7360ce47b5ec3f9fa71f18071ecb8b97";
};
patches = [./udev-091-installpath.patch];
preBuild = "makeFlagsArray=(etcdir=$out/etc sbindir=$out/sbin usrbindir=$out/bin usrsbindir=$out/sbin mandir=$out/share/man)";
preInstall = "installFlagsArray=(\"\${makeFlagsArray[@]}\" udevdir=dummy)";
}

15
pkgs/os-specific/linux/udev/udev-091-installpath.patch
View file

@ -1,15 +0,0 @@
diff -ruN udev-091/Makefile udev-091.new/Makefile
--- udev-091/Makefile 2006-04-25 22:39:59.000000000 +0200
+++ udev-091.new/Makefile 2006-04-28 15:15:56.000000000 +0200
@@ -104,9 +104,9 @@
mandir = ${prefix}/usr/share/man
configdir = ${etcdir}/udev
udevdir = /dev
-DESTDIR =
+DESTDIR = ${out}
-INSTALL = /usr/bin/install -c
+INSTALL = install -c
INSTALL_PROGRAM = ${INSTALL}
INSTALL_DATA = ${INSTALL} -m 644
INSTALL_SCRIPT = ${INSTALL_PROGRAM}

12
pkgs/os-specific/linux/udev/udev-installpath.patch
View file

@ -1,12 +0,0 @@
diff -ruN udev-068/Makefile udev-068.new/Makefile
--- udev-068/Makefile 2005-08-18 19:04:49.000000000 +0200
+++ udev-068.new/Makefile 2005-08-19 16:09:22.000000000 +0200
@@ -55,7 +55,7 @@
STARTER = udevstart
RELEASE_NAME = $(ROOT)-$(VERSION)
LOCAL_CFG_DIR = etc/udev
-DESTDIR =
+DESTDIR = ${out}
KERNEL_DIR = /lib/modules/${shell uname -r}/build
# override this to make udev look in a different location for it's config files