Making the two ralink wireless firmwares have files that don't collide on buildEnv.

svn path=/nixpkgs/trunk/; revision=22590
This commit is contained in:
Lluís Batlle i Rossell 2010-07-13 21:32:18 +00:00
parent f85cf594d3
commit 784852ab72
2 changed files with 4 additions and 4 deletions

View File

@ -1,6 +1,6 @@
{stdenv, fetchurl, unzip}: {stdenv, fetchurl, unzip}:
stdenv.mkDerivation { stdenv.mkDerivation rec {
name = "rt2870-fw-22"; name = "rt2870-fw-22";
src = fetchurl { src = fetchurl {
url = "http://www.ralinktech.com/download.php?t=U0wyRnpjMlYwY3k4eU1ERXdMekF6THpNeEwyUnZkMjVzYjJGa01UWXpPRGs1T0Rnek5pNTZhWEE5UFQxU1ZESTROekJmUm1seWJYZGhjbVZmVmpJeUM%3D"; url = "http://www.ralinktech.com/download.php?t=U0wyRnpjMlYwY3k4eU1ERXdMekF6THpNeEwyUnZkMjVzYjJGa01UWXpPRGs1T0Rnek5pNTZhWEE5UFQxU1ZESTROekJmUm1seWJYZGhjbVZmVmpJeUM%3D";
@ -16,7 +16,7 @@ stdenv.mkDerivation {
# says: "Your rights to redistribute the Software shall be # says: "Your rights to redistribute the Software shall be
# contingent upon your installation of this Agreement in its # contingent upon your installation of this Agreement in its
# entirety in the same directory as the Software." # entirety in the same directory as the Software."
installPhase = "ensureDir $out; cp * $out"; installPhase = "ensureDir $out/${name}; cp *.bin $out; cp *.txt $out/${name}";
meta = { meta = {
description = "Firmware for the Ralink RT2870 wireless cards"; description = "Firmware for the Ralink RT2870 wireless cards";

View File

@ -1,6 +1,6 @@
{stdenv, fetchurl, unzip}: {stdenv, fetchurl, unzip}:
stdenv.mkDerivation { stdenv.mkDerivation rec {
name = "rt73-fw-1.8"; name = "rt73-fw-1.8";
src = fetchurl { src = fetchurl {
url = "http://www.ralinktech.com/download.php?t=U0wyRnpjMlYwY3k4eU1EQTVMekF6THpNeEwyUnZkMjVzYjJGa056YzVPVE13TmpZMk9TNTZhWEE5UFQxU1ZEY3hWMTlHYVhKdGQyRnlaVjlXTVM0NEM%3D"; url = "http://www.ralinktech.com/download.php?t=U0wyRnpjMlYwY3k4eU1EQTVMekF6THpNeEwyUnZkMjVzYjJGa056YzVPVE13TmpZMk9TNTZhWEE5UFQxU1ZEY3hWMTlHYVhKdGQyRnlaVjlXTVM0NEM%3D";
@ -16,7 +16,7 @@ stdenv.mkDerivation {
# says: "Your rights to redistribute the Software shall be # says: "Your rights to redistribute the Software shall be
# contingent upon your installation of this Agreement in its # contingent upon your installation of this Agreement in its
# entirety in the same directory as the Software." # entirety in the same directory as the Software."
installPhase = "ensureDir $out; cp * $out"; installPhase = "ensureDir $out/${name}; cp *.bin $out; cp *.txt $out/${name}";
meta = { meta = {
description = "Firmware for the Ralink RT73 wireless card"; description = "Firmware for the Ralink RT73 wireless card";