Unverified Commit 457fa154 authored by Stefan Frijters's avatar Stefan Frijters
Browse files

iosevka: use structuredAttrs instead of passAsFile

parent 7d00d2d0

pkgs/by-name/io/iosevka/package.nix

+5 −9
Original line number Diff line number Diff line
@@ -85,22 +85,16 @@ buildNpmPackage rec { 
      privateBuildPlan;



  inherit extraParameters;

  passAsFile = [

    "extraParameters"

  ]

  ++ lib.optionals (

    !(builtins.isString privateBuildPlan && lib.hasPrefix builtins.storeDir privateBuildPlan)

  ) [ "buildPlan" ];



  configurePhase = ''

    runHook preConfigure

    ${lib.optionalString (builtins.isAttrs privateBuildPlan) ''

      remarshal -i "$buildPlanPath" -o private-build-plans.toml -if json -of toml

      printf "%s" "$buildPlan" | remarshal -o private-build-plans.toml -if json -of toml

    ''}

    ${lib.optionalString

      (builtins.isString privateBuildPlan && (!lib.hasPrefix builtins.storeDir privateBuildPlan))

      ''

        cp "$buildPlanPath" private-build-plans.toml

        printf "%s" "$buildPlan" > private-build-plans.toml

      ''

    }

    ${lib.optionalString
@@ -111,7 +105,7 @@ buildNpmPackage rec { 
    }

    ${lib.optionalString (extraParameters != null) ''

      echo -e "\n" >> params/parameters.toml

      cat "$extraParametersPath" >> params/parameters.toml

      printf "%s" "$extraParameters" >> params/parameters.toml

    ''}

    runHook postConfigure

  '';
@@ -137,6 +131,8 @@ buildNpmPackage rec { 
  enableParallelBuilding = true;

  requiredSystemFeatures = [ "big-parallel" ];



  __structuredAttrs = true;



  meta = {

    homepage = "https://typeof.net/Iosevka/";

    downloadPage = "https://github.com/be5invis/Iosevka/releases";