From 55068cef8a19a6a4d6bbe18a051b5d872f6cae4a Mon Sep 17 00:00:00 2001 From: Armijn Hemel Date: Wed, 4 Jan 2006 23:08:50 +0000 Subject: [PATCH] we don't have /usr/bin/install on NixOS, so remove this path svn path=/nixpkgs/trunk/; revision=4489 --- pkgs/os-specific/linux/hotplug/default.nix | 2 +- pkgs/os-specific/linux/hotplug/hotplug-install.patch | 12 ++++++++++++ 2 files changed, 13 insertions(+), 1 deletion(-) create mode 100644 pkgs/os-specific/linux/hotplug/hotplug-install.patch diff --git a/pkgs/os-specific/linux/hotplug/default.nix b/pkgs/os-specific/linux/hotplug/default.nix index f3b4533a6f84..af8baacdfc2a 100644 --- a/pkgs/os-specific/linux/hotplug/default.nix +++ b/pkgs/os-specific/linux/hotplug/default.nix @@ -6,5 +6,5 @@ stdenv.mkDerivation { url = http://surfnet.dl.sourceforge.net/sourceforge/linux-hotplug/hotplug-2004_03_29.tar.gz; md5 = "167bd479a1ca30243c51ca088e0942b3"; }; - patches = [./hotplug-install-path.patch]; + patches = [./hotplug-install-path.patch ./hotplug-install.patch]; } diff --git a/pkgs/os-specific/linux/hotplug/hotplug-install.patch b/pkgs/os-specific/linux/hotplug/hotplug-install.patch new file mode 100644 index 000000000000..c77d38328a2d --- /dev/null +++ b/pkgs/os-specific/linux/hotplug/hotplug-install.patch @@ -0,0 +1,12 @@ +diff -ruN hotplug-2004_03_29/Makefile hotplug-2004_03_29.new/Makefile +--- hotplug-2004_03_29/Makefile 2003-06-28 02:13:10.000000000 +0200 ++++ hotplug-2004_03_29.new/Makefile 2006-01-04 23:48:15.000000000 +0100 +@@ -12,7 +12,7 @@ + mandir = ${prefix}/usr/share/man + srcdir = . + +-INSTALL = /usr/bin/install -c ++INSTALL = install -c + INSTALL_PROGRAM = ${INSTALL} + INSTALL_DATA = ${INSTALL} -m 644 + INSTALL_SCRIPT = ${INSTALL_PROGRAM}