on iko/ghcjs-patch-master help sign in
Don't require materialized spdx fixes #1515 (#1516)
commit7c26ef068ad6f51d09856abce530df7aa2e840d3 authorHamish Mackenzie <Hamish.K.Mackenzie@gmail.com> dateThu 16 Jun 2022, 00:21 (4 years ago) parentbeb2d05
1 file changed+4−4
lib/spdx/licenses.nix+4−4
lib/spdx/licenses.nix+4−4
@@ -1,12 +1,12 @@
11pkgs:
22with builtins; let
3− materialized = ../../materialized + "/spdx-${pkgs.evalPackages.spdx-license-list-data.version}";
3+ materialized' = ../../materialized + "/spdx-${pkgs.evalPackages.spdx-license-list-data.version}";
44 licensesJSON = fromJSON (replaceStrings
55 [ "\\u0026" "\\u0027" "\\u003d" ]
66 [ "&" "'" "=" ]
7− (readFile "${pkgs.evalPackages.haskell-nix.materialize (pkgs.lib.optionalAttrs (pathExists materialized) {
8− inherit materialized;
9− }) (pkgs.evalPackages.runCommand "spdx-json" {} ''
7+ (readFile "${pkgs.evalPackages.haskell-nix.materialize {
8+ materialized = if pathExists materialized' then materialized' else null;
9+ } (pkgs.evalPackages.runCommand "spdx-json" {} ''
1010 mkdir $out
1111 cp ${pkgs.evalPackages.spdx-license-list-data.json or pkgs.evalPackages.spdx-license-list-data}/json/licenses.json $out
1212 '')