about summary refs log tree commit diff
path: root/machines
diff options
context:
space:
mode:
authoraszlig <aszlig@redmoonstudios.org>2013-09-06 14:54:39 +0200
committeraszlig <aszlig@redmoonstudios.org>2013-09-06 14:55:30 +0200
commit0a818bdf0ee11d0ecea57d10f8219afae346df80 (patch)
treef146e04899106f3391bbf882d6a3d10d2e9e566a /machines
parent26223ffa0cbb67e8b97361dfa8f8e23867702599 (diff)
dnyarri: Fix firmware path.
The firmware is now located within lib/firmware in the
firmwareLinuxNonfree output poth.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
Diffstat (limited to 'machines')
-rw-r--r--machines/dnyarri.nix6
1 files changed, 4 insertions, 2 deletions
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}"