Unverified Commit 789031a2 authored by jopejoe1's avatar jopejoe1 Committed by GitHub
Browse files

akkuPackages: do not define meta.{description,homepage} to empty strings (#458597)

parents d9981575 1376730c
Loading
Loading
Loading
Loading
+52 −46
Original line number Diff line number Diff line
@@ -20,8 +20,8 @@ lib.makeScope newScope (self: rec {
          url,
          sha256,
          source,
          synopsis ? "",
          homepage ? "",
          synopsis ? null,
          homepage ? null,
          ...
        }:
        (akkuDerivation {
@@ -35,9 +35,8 @@ lib.makeScope newScope (self: rec {
          nativeBuildInputs = map (x: akkuself.${x}) dev-dependencies;
          unpackPhase = "tar xf $src";

          meta.homepage = homepage;
          meta.description = synopsis;
          meta.license =
          meta = {
            license =
              let
                stringToLicense =
                  s:
@@ -79,6 +78,13 @@ lib.makeScope newScope (self: rec {
                  ).${s} or s;
              in
              if builtins.isList license then map stringToLicense license else stringToLicense license;
          }
          // lib.optionalAttrs (homepage != null) {
            inherit homepage;
          }
          // lib.optionalAttrs (synopsis != null) {
            description = synopsis;
          };
        }).overrideAttrs
          ({ "${pname}" = lib.id; } // overrides)."${pname}";
      deps = lib.importTOML ./deps.toml;