diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2013-09-04 14:22:24 +0200 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2013-09-04 14:23:44 +0200 |
| commit | 26028c2107cd4ad1f7059735bec043d5fcaf3e4d (patch) | |
| tree | 9382b6f8dc20e32fd3711d3deabb833c9eb51006 /pkgs/os-specific/linux/microcode | |
| parent | 8a56adee74e9312d7152c1c2ab8afc7a2a0c2b2b (diff) | |
| download | nixpkgs-26028c2107cd4ad1f7059735bec043d5fcaf3e4d.tar nixpkgs-26028c2107cd4ad1f7059735bec043d5fcaf3e4d.tar.gz nixpkgs-26028c2107cd4ad1f7059735bec043d5fcaf3e4d.tar.bz2 nixpkgs-26028c2107cd4ad1f7059735bec043d5fcaf3e4d.tar.lz nixpkgs-26028c2107cd4ad1f7059735bec043d5fcaf3e4d.tar.xz nixpkgs-26028c2107cd4ad1f7059735bec043d5fcaf3e4d.tar.zst nixpkgs-26028c2107cd4ad1f7059735bec043d5fcaf3e4d.zip | |
Install firmware in $out/lib/firmware instead of $out
Diffstat (limited to 'pkgs/os-specific/linux/microcode')
| -rw-r--r-- | pkgs/os-specific/linux/microcode/amd.nix | 16 | ||||
| -rw-r--r-- | pkgs/os-specific/linux/microcode/intel.nix | 5 |
2 files changed, 11 insertions, 10 deletions
diff --git a/pkgs/os-specific/linux/microcode/amd.nix b/pkgs/os-specific/linux/microcode/amd.nix index d54f93a7bd1..0ca33fa31f0 100644 --- a/pkgs/os-specific/linux/microcode/amd.nix +++ b/pkgs/os-specific/linux/microcode/amd.nix @@ -1,25 +1,25 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "amd-ucode-2012-09-10"; src = fetchurl { 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"; }; installPhase = '' - mkdir -p $out/amd-ucode - mv microcode_amd_fam15h.bin microcode_amd.bin $out/amd-ucode/ + mkdir -p $out/lib/firmware/amd-ucode $out/share/doc/amd-ucode + mv microcode_amd_fam15h.bin microcode_amd.bin $out/lib/firmware/amd-ucode/ + mv LICENSE $out/share/doc/amd-ucode ''; meta = { - description = "AMD Processor Microcode Patch"; - homepage = "http://www.amd64.org/support/microcode.html"; - license = "non-free"; + description = "AMD Processor microcode patch"; + homepage = http://www.amd64.org/support/microcode.html; + license = stdenv.lib.licenses.unfreeRedistributableFirmware; }; } diff --git a/pkgs/os-specific/linux/microcode/intel.nix b/pkgs/os-specific/linux/microcode/intel.nix index fdd8bf63dfc..ad7cea18084 100644 --- a/pkgs/os-specific/linux/microcode/intel.nix +++ b/pkgs/os-specific/linux/microcode/intel.nix @@ -11,6 +11,7 @@ stdenv.mkDerivation { }; buildInputs = [ microcode2ucode ]; + sourceRoot = "."; buildPhase = '' @@ -18,8 +19,8 @@ stdenv.mkDerivation { ''; installPhase = '' - mkdir -p $out - cp -r intel-ucode "$out/" + mkdir -p $out/lib/firmware + cp -r intel-ucode "$out/lib/firmware/" ''; meta = { |