diff options
author | Michael Raskin <7c6f434c@mail.ru> | 2008-08-19 05:54:09 +0000 |
---|---|---|
committer | Michael Raskin <7c6f434c@mail.ru> | 2008-08-19 05:54:09 +0000 |
commit | 87ff8d6347cd99618bc8f9ff58ddf357ce38c522 (patch) | |
tree | 304d18d1a67cf9e844bf9d772b2a5386d00aa5f0 /pkgs/os-specific/linux/atheros | |
parent | b5b68ce414fabb63a782dd74e86e940350e9a662 (diff) | |
download | nixlib-87ff8d6347cd99618bc8f9ff58ddf357ce38c522.tar nixlib-87ff8d6347cd99618bc8f9ff58ddf357ce38c522.tar.gz nixlib-87ff8d6347cd99618bc8f9ff58ddf357ce38c522.tar.bz2 nixlib-87ff8d6347cd99618bc8f9ff58ddf357ce38c522.tar.lz nixlib-87ff8d6347cd99618bc8f9ff58ddf357ce38c522.tar.xz nixlib-87ff8d6347cd99618bc8f9ff58ddf357ce38c522.tar.zst nixlib-87ff8d6347cd99618bc8f9ff58ddf357ce38c522.zip |
Changed builderDefs to use composedArgsAndFun, reduced number of nulls, made overrides in builderDefsPackage to work in an intuitive manner.
svn path=/nixpkgs/trunk/; revision=12655
Diffstat (limited to 'pkgs/os-specific/linux/atheros')
-rw-r--r-- | pkgs/os-specific/linux/atheros/0.9.4.nix | 4 | ||||
-rw-r--r-- | pkgs/os-specific/linux/atheros/r3693.nix | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/pkgs/os-specific/linux/atheros/0.9.4.nix b/pkgs/os-specific/linux/atheros/0.9.4.nix index 38309d53537a..f187dbe234d8 100644 --- a/pkgs/os-specific/linux/atheros/0.9.4.nix +++ b/pkgs/os-specific/linux/atheros/0.9.4.nix @@ -1,5 +1,5 @@ args : with args; - let localDefs = builderDefs { + let localDefs = builderDefs.meta.function { src = /* put a fetchurl here */ fetchurl { url = http://downloads.sourceforge.net/madwifi/madwifi-0.9.4.tar.gz; @@ -9,7 +9,7 @@ args : with args; buildInputs = []; configureFlags = []; makeFlags = [''KERNELPATH=${kernel}/lib/modules/*/build'' ''DESTDIR=$out'']; - } null; /* null is a terminator for sumArgs */ + }; in with localDefs; let postInstall = FullDepEntry ('' diff --git a/pkgs/os-specific/linux/atheros/r3693.nix b/pkgs/os-specific/linux/atheros/r3693.nix index 159a44cb224b..e4544608c249 100644 --- a/pkgs/os-specific/linux/atheros/r3693.nix +++ b/pkgs/os-specific/linux/atheros/r3693.nix @@ -1,5 +1,5 @@ args : with args; - let localDefs = builderDefs { + let localDefs = builderDefs.meta.function { src = fetchurl { url = http://snapshots.madwifi.org/madwifi-trunk/madwifi-trunk-r3693-20080602.tar.gz; sha256 = "0r9nnxcq50rgwcm9y93rpk3mqknl3ixkxkd72437b55qlz1f9vs3"; @@ -12,7 +12,7 @@ args : with args; url = http://people.freebsd.org/~sam/ath_hal-20080528.tgz; sha256 = "1a6glkd8n46876hl48ib08p81qwsvrk4153j4b9xrxgid6f8bar9"; }; - } null; /* null is a terminator for sumArgs */ + }; in with localDefs; let preBuild = FullDepEntry ('' |