From 0a818bdf0ee11d0ecea57d10f8219afae346df80 Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Fri, 6 Sep 2013 14:54:39 +0200
Subject: dnyarri: Fix firmware path.

The firmware is now located within lib/firmware in the
firmwareLinuxNonfree output poth.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
---
 machines/dnyarri.nix | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'machines')

diff --git a/machines/dnyarri.nix b/machines/dnyarri.nix
index 445a5aac..254ba557 100644
--- a/machines/dnyarri.nix
+++ b/machines/dnyarri.nix
@@ -55,10 +55,12 @@ with import ../lib;
 
         builtin_firmware = pkgs.stdenv.mkDerivation {
           name = "builtin-firmware";
-          buildCommand = ''
+          buildCommand = let
+            firmwareBasePath = "${pkgs.firmwareLinuxNonfree}/lib/firmware";
+          in ''
             mkdir -p "$out/radeon"
             ${concatMapStrings (x: ''
-              cp -Lv -t "$out/radeon" "${pkgs.firmwareLinuxNonfree}/${x}";
+              cp -Lv -t "$out/radeon" "${firmwareBasePath}/${x}";
             '') radeonFW}
 
             cp "${patch51}" "$out/${patch51Name}"
-- 
cgit 1.4.1