Author: viric
Date: Tue Jul 13 21:32:18 2010
New Revision: 22590
URL: https://svn.nixos.org/websvn/nix/?rev=22590&sc=1
Log:
Making the two ralink wireless firmwares have files that don't collide on
buildEnv.
Modified:
nixpkgs/trunk/pkgs/os-specific/linux/firmware/rt2870/default.nix
nixpkgs/trunk/pkgs/os-specific/linux/firmware/rt73/default.nix
Modified: nixpkgs/trunk/pkgs/os-specific/linux/firmware/rt2870/default.nix
==============================================================================
--- nixpkgs/trunk/pkgs/os-specific/linux/firmware/rt2870/default.nix Tue Jul
13 21:11:35 2010 (r22589)
+++ nixpkgs/trunk/pkgs/os-specific/linux/firmware/rt2870/default.nix Tue Jul
13 21:32:18 2010 (r22590)
@@ -1,6 +1,6 @@
{stdenv, fetchurl, unzip}:
-stdenv.mkDerivation {
+stdenv.mkDerivation rec {
name = "rt2870-fw-22";
src = fetchurl {
url =
"http://www.ralinktech.com/download.php?t=U0wyRnpjMlYwY3k4eU1ERXdMekF6THpNeEwyUnZkMjVzYjJGa01UWXpPRGs1T0Rnek5pNTZhWEE5UFQxU1ZESTROekJmUm1seWJYZGhjbVZmVmpJeUM%3D";
@@ -16,7 +16,7 @@
# says: "Your rights to redistribute the Software shall be
# contingent upon your installation of this Agreement in its
# 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 = {
description = "Firmware for the Ralink RT2870 wireless cards";
Modified: nixpkgs/trunk/pkgs/os-specific/linux/firmware/rt73/default.nix
==============================================================================
--- nixpkgs/trunk/pkgs/os-specific/linux/firmware/rt73/default.nix Tue Jul
13 21:11:35 2010 (r22589)
+++ nixpkgs/trunk/pkgs/os-specific/linux/firmware/rt73/default.nix Tue Jul
13 21:32:18 2010 (r22590)
@@ -1,6 +1,6 @@
{stdenv, fetchurl, unzip}:
-stdenv.mkDerivation {
+stdenv.mkDerivation rec {
name = "rt73-fw-1.8";
src = fetchurl {
url =
"http://www.ralinktech.com/download.php?t=U0wyRnpjMlYwY3k4eU1EQTVMekF6THpNeEwyUnZkMjVzYjJGa056YzVPVE13TmpZMk9TNTZhWEE5UFQxU1ZEY3hWMTlHYVhKdGQyRnlaVjlXTVM0NEM%3D";
@@ -16,7 +16,7 @@
# says: "Your rights to redistribute the Software shall be
# contingent upon your installation of this Agreement in its
# 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 = {
description = "Firmware for the Ralink RT73 wireless card";
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits