cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

Merge pull request #185004 from amjoseph-nixpkgs/pr/atf/prevent-version-mixup

Browse source
This commit is contained in:
Sandro 2022-08-13 19:03:09 +02:00 committed by GitHub
commit d54c213c55
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
pkgs/misc/arm-trusted-firmware/default.nix
View file

@ -17,17 +17,16 @@ let
, platformCanUseHDCPBlob ? false # set this to true if the platform is able to use hdcp.bin , platformCanUseHDCPBlob ? false # set this to true if the platform is able to use hdcp.bin
, extraMakeFlags ? [] , extraMakeFlags ? []
, extraMeta ? {} , extraMeta ? {}
, version ? "2.7"
, ... } @ args: , ... } @ args:
# delete hdcp.bin if either: the platform is thought to # delete hdcp.bin if either: the platform is thought to
# not need it or unfreeIncludeHDCPBlob is false # not need it or unfreeIncludeHDCPBlob is false
let deleteHDCPBlobBeforeBuild = !platformCanUseHDCPBlob || !unfreeIncludeHDCPBlob; in let deleteHDCPBlobBeforeBuild = !platformCanUseHDCPBlob || !unfreeIncludeHDCPBlob; in
stdenv.mkDerivation ({ stdenv.mkDerivation (rec {
pname = "arm-trusted-firmware${lib.optionalString (platform != null) "-${platform}"}"; pname = "arm-trusted-firmware${lib.optionalString (platform != null) "-${platform}"}";
inherit version; version = "2.7";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "ARM-software"; owner = "ARM-software";