Fixed Atheros to export utilities in PATH

svn path=/nixpkgs/trunk/; revision=10902
This commit is contained in:
Michael Raskin 2008-03-02 11:04:51 +00:00
parent b1ec2a1eb2
commit c263a71810
3 changed files with 17 additions and 3 deletions

View File

@ -22,11 +22,15 @@ doPatch = FullDepEntry (if patchAR2425x86 !="" then ''
cd hal cd hal
patch -Np1 -i ${patchAR2425x86} patch -Np1 -i ${patchAR2425x86}
'' else "") [minInit doUnpack]; '' else "") [minInit doUnpack];
postInstall = FullDepEntry (''
ln -s $out/usr/local/bin $out/bin
'') [minInit doMakeInstall];
in in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "atheros-"+version; name = "atheros-"+version;
builder = writeScript (name + "-builder") builder = writeScript (name + "-builder")
(textClosure localDefs [doPatch doMakeInstall doForceShare doPropagate]); (textClosure localDefs [doPatch doMakeInstall
postInstall doForceShare doPropagate]);
meta = { meta = {
description = " description = "
Atheros WiFi driver. Atheros WiFi driver.

View File

@ -23,11 +23,15 @@ doPatch = FullDepEntry (if patchAR2425x86 !="" then ''
patch -Np1 -i ${patchAR2425x86} patch -Np1 -i ${patchAR2425x86}
cd .. cd ..
'' else "") [minInit doUnpack]; '' else "") [minInit doUnpack];
postInstall = FullDepEntry (''
ln -s $out/usr/local/bin $out/bin
'') [minInit doMakeInstall];
in in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "atheros-"+version; name = "atheros-"+version;
builder = writeScript (name + "-builder") builder = writeScript (name + "-builder")
(textClosure localDefs [doPatch doMakeInstall doForceShare doPropagate]); (textClosure localDefs [doPatch doMakeInstall
postInstall doForceShare doPropagate]);
meta = { meta = {
description = " description = "
Atheros WiFi driver. Atheros WiFi driver.

View File

@ -11,10 +11,16 @@ args : with args;
makeFlags = [''KERNELPATH=${kernel}/lib/modules/*/build'' ''DESTDIR=$out'']; makeFlags = [''KERNELPATH=${kernel}/lib/modules/*/build'' ''DESTDIR=$out''];
} null; /* null is a terminator for sumArgs */ } null; /* null is a terminator for sumArgs */
in with localDefs; in with localDefs;
let
postInstall = FullDepEntry (''
ln -s $out/usr/local/bin $out/bin
'') [minInit doMakeInstall];
in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "atheros-"+version; name = "atheros-"+version;
builder = writeScript (name + "-builder") builder = writeScript (name + "-builder")
(textClosure localDefs [doMakeInstall doForceShare doPropagate]); (textClosure localDefs [doMakeInstall postInstall
doForceShare doPropagate]);
meta = { meta = {
description = " description = "
Atheros WiFi driver. Atheros WiFi driver.