diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2022-04-16 00:12:16 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-04-16 00:12:16 +0000 |
| commit | d2a3434bd4720a186f4bd7dc7f0e0f5a0424350f (patch) | |
| tree | 4f6fda005d7d34567d5ddd016683bf5323d49abf /pkgs/data | |
| parent | 783cd7221f2fa041bca2f0ab9fa356570fa6c3d5 (diff) | |
| parent | 727e1d7d62a5c9fc8e5568133fba99965a7e5503 (diff) | |
Merge master into haskell-updates
Diffstat (limited to 'pkgs/data')
| -rw-r--r-- | pkgs/data/fonts/iosevka/bin.nix | 3 | ||||
| -rw-r--r-- | pkgs/data/misc/shared-mime-info/default.nix | 1 |
2 files changed, 3 insertions, 1 deletions
diff --git a/pkgs/data/fonts/iosevka/bin.nix b/pkgs/data/fonts/iosevka/bin.nix index 3ebaf49abebc2..0d8f0a2eb6e7c 100644 --- a/pkgs/data/fonts/iosevka/bin.nix +++ b/pkgs/data/fonts/iosevka/bin.nix @@ -30,7 +30,8 @@ in stdenv.mkDerivation rec { unzip -d $out/share/fonts/truetype $src ''; - meta = iosevka.meta // { + meta = { + inherit (iosevka.meta) homepage downloadPage description license platforms; maintainers = with lib.maintainers; [ cstrahan ]; diff --git a/pkgs/data/misc/shared-mime-info/default.nix b/pkgs/data/misc/shared-mime-info/default.nix index 2feb5e2f5a471..a2d2849bac1e5 100644 --- a/pkgs/data/misc/shared-mime-info/default.nix +++ b/pkgs/data/misc/shared-mime-info/default.nix @@ -51,5 +51,6 @@ stdenv.mkDerivation rec { license = licenses.gpl2Plus; platforms = platforms.unix; maintainers = teams.freedesktop.members ++ [ maintainers.mimame ]; + mainProgram = "update-mime-database"; }; } |