diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2006-11-07 21:13:57 +0000 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2006-11-07 21:13:57 +0000 |
| commit | 986ec9c8a12cef0c38d8f39edd1117e74d8b0f45 (patch) | |
| tree | 9352b6382412c8b912cc7059da80337fc6f232d3 /pkgs/os-specific/linux/udev | |
| parent | dab13a2af078bfdc8f92ef4ba35bcf4bc4f01338 (diff) | |
| download | nixpkgs-986ec9c8a12cef0c38d8f39edd1117e74d8b0f45.tar nixpkgs-986ec9c8a12cef0c38d8f39edd1117e74d8b0f45.tar.gz nixpkgs-986ec9c8a12cef0c38d8f39edd1117e74d8b0f45.tar.bz2 nixpkgs-986ec9c8a12cef0c38d8f39edd1117e74d8b0f45.tar.lz nixpkgs-986ec9c8a12cef0c38d8f39edd1117e74d8b0f45.tar.xz nixpkgs-986ec9c8a12cef0c38d8f39edd1117e74d8b0f45.tar.zst nixpkgs-986ec9c8a12cef0c38d8f39edd1117e74d8b0f45.zip | |
* Fix some paths.
svn path=/nixpkgs/trunk/; revision=6974
Diffstat (limited to 'pkgs/os-specific/linux/udev')
| -rw-r--r-- | pkgs/os-specific/linux/udev/default.nix | 3 | ||||
| -rw-r--r-- | pkgs/os-specific/linux/udev/udev-091-installpath.patch | 15 | ||||
| -rw-r--r-- | pkgs/os-specific/linux/udev/udev-installpath.patch | 12 |
3 files changed, 2 insertions, 28 deletions
diff --git a/pkgs/os-specific/linux/udev/default.nix b/pkgs/os-specific/linux/udev/default.nix index b492b53e230..a8980e4c4a0 100644 --- a/pkgs/os-specific/linux/udev/default.nix +++ b/pkgs/os-specific/linux/udev/default.nix @@ -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)"; } diff --git a/pkgs/os-specific/linux/udev/udev-091-installpath.patch b/pkgs/os-specific/linux/udev/udev-091-installpath.patch deleted file mode 100644 index 4e470f709f3..00000000000 --- a/pkgs/os-specific/linux/udev/udev-091-installpath.patch +++ /dev/null @@ -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} diff --git a/pkgs/os-specific/linux/udev/udev-installpath.patch b/pkgs/os-specific/linux/udev/udev-installpath.patch deleted file mode 100644 index 0406ee2a2f1..00000000000 --- a/pkgs/os-specific/linux/udev/udev-installpath.patch +++ /dev/null @@ -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 |