Merge pull request #121 from thillux/cargo-fixes

handle empty attrset and line break
nikstur · Jul 16, 2024 · 80cdf87 · 80cdf87
2 parents 35ce4ed + a5b64c7
commit 80cdf87
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/nix/passthru-vendored.nix b/nix/passthru-vendored.nix
@@ -14,13 +14,13 @@
           outputs = [ "out" ];
           phases = [ "unpackPhase" "patchPhase" "configurePhase" "buildPhase" "installPhase" ];
           buildPhase = ''
-            cargo cyclonedx --spec-version 1.4 --format json --target ${pkgs.stdenv.hostPlatform.rust.rustcTarget}
+            cargo cyclonedx --spec-version 1.4 --format json --target ${pkgs.stdenv.hostPlatform.rust.rustcTarget} \
           ''
           + pkgs.lib.optionalString
-            (builtins.hasAttr "buildNoDefaultFeatures" previousAttrs)
+            (builtins.hasAttr "buildNoDefaultFeatures" previousAttrs && previousAttrs.buildNoDefaultFeatures)
             " --no-default-features"
           + pkgs.lib.optionalString
-            (builtins.hasAttr "buildFeatures" previousAttrs)
+            (builtins.hasAttr "buildFeatures" previousAttrs && builtins.length previousAttrs.buildFeatures > 0)
             (" --features " + builtins.concatStringsSep "," previousAttrs.buildFeatures)
           ;
           installPhase = ''