swendel/nixpkgs
1
0
Fork 0
mirror of https://github.com/SebastianWendel/nixpkgs.git synced 2024-09-20 12:29:02 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #247111 from K900/requirefile-fix-error-message

Browse source 
requireFile: fix error message with SRI hashes
This commit is contained in:
K900 2023-08-05 21:42:38 +03:00 committed by GitHub
parent abb697a0cd 8bd0cd850b
commit fe0f28c09d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
pkgs/build-support/trivial-builders/default.nix
View file

@ -824,9 +824,10 @@ rec {
or
nix-prefetch-url --type ${hashAlgo} file:///path/to/${name_}
'';
hashAlgo = if hash != null then ""
hashAlgo = if hash != null then (builtins.head (lib.strings.splitString "-" hash))
else if sha256 != null then "sha256"
else "sha1";
hashAlgo_ = if hash != null then "" else hashAlgo;
hash_ = if hash != null then hash
else if sha256 != null then sha256
else sha1;
@ -835,7 +836,7 @@ rec {
stdenvNoCC.mkDerivation {
name = name_;
outputHashMode = hashMode;
outputHashAlgo = hashAlgo;
outputHashAlgo = hashAlgo_;
outputHash = hash_;
preferLocalBuild = true;
allowSubstitutes = false;