Install firmware in $out/lib/firmware instead of $out

This commit is contained in:
Eelco Dolstra 2013-09-04 14:22:24 +02:00
parent 8a56adee74
commit 26028c2107
3 changed files with 13 additions and 12 deletions

View File

@ -54,8 +54,8 @@ in stdenv.mkDerivation {
buildInputs = [ dpkg ]; buildInputs = [ dpkg ];
installPhase = '' installPhase = ''
mkdir -p $out/share mkdir -p $out/share $out/lib/firmware
cp -r lib/firmware/* "$out/" cp -r lib/firmware/* "$out/lib/firmware/"
cp -r usr/share/doc $out/share/ cp -r usr/share/doc $out/share/
find $out/share -name changelog.gz | xargs rm find $out/share -name changelog.gz | xargs rm
''; '';

View File

@ -1,25 +1,25 @@
{ stdenv, fetchurl }: { stdenv, fetchurl }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "amd-ucode-2012-09-10"; name = "amd-ucode-2012-09-10";
src = fetchurl { src = fetchurl {
urls = urls =
[ "http://www.amd64.org/pub/microcode/${name}.tar" [ "http://pkgs.fedoraproject.org/repo/pkgs/microcode_ctl/${name}.tar/559bc355d3799538584add80df2996f0/${name}.tar"
"http://pkgs.fedoraproject.org/repo/pkgs/microcode_ctl/${name}.tar/559bc355d3799538584add80df2996f0/${name}.tar" "http://www.amd64.org/pub/microcode/${name}.tar"
]; ];
sha256 = "065phvhx5hx5ssdd1x2p5m1yv26ak7l5aaw6yk6h95x9mxn5r111"; sha256 = "065phvhx5hx5ssdd1x2p5m1yv26ak7l5aaw6yk6h95x9mxn5r111";
}; };
installPhase = '' installPhase = ''
mkdir -p $out/amd-ucode mkdir -p $out/lib/firmware/amd-ucode $out/share/doc/amd-ucode
mv microcode_amd_fam15h.bin microcode_amd.bin $out/amd-ucode/ mv microcode_amd_fam15h.bin microcode_amd.bin $out/lib/firmware/amd-ucode/
mv LICENSE $out/share/doc/amd-ucode
''; '';
meta = { meta = {
description = "AMD Processor Microcode Patch"; description = "AMD Processor microcode patch";
homepage = "http://www.amd64.org/support/microcode.html"; homepage = http://www.amd64.org/support/microcode.html;
license = "non-free"; license = stdenv.lib.licenses.unfreeRedistributableFirmware;
}; };
} }

View File

@ -11,6 +11,7 @@ stdenv.mkDerivation {
}; };
buildInputs = [ microcode2ucode ]; buildInputs = [ microcode2ucode ];
sourceRoot = "."; sourceRoot = ".";
buildPhase = '' buildPhase = ''
@ -18,8 +19,8 @@ stdenv.mkDerivation {
''; '';
installPhase = '' installPhase = ''
mkdir -p $out mkdir -p $out/lib/firmware
cp -r intel-ucode "$out/" cp -r intel-ucode "$out/lib/firmware/"
''; '';
meta = { meta = {