diff options
| author | Martin Weinelt <hexa@darmstadt.ccc.de> | 2022-04-15 13:30:48 +0200 |
|---|---|---|
| committer | Martin Weinelt <hexa@darmstadt.ccc.de> | 2022-04-15 13:30:48 +0200 |
| commit | a7fc5aaa76366aa376f79bbe71e3e482bb1c1815 (patch) | |
| tree | 70aad45cbffcac051408a1d124e4b4ce91bb895c /pkgs/data | |
| parent | 084f4811ec23f4b0be6a10db44f6f970ba770759 (diff) | |
| parent | 2587e6d1f6d28961c5058026606877d643e2fe29 (diff) | |
Merge remote-tracking branch 'origin/master' into staging-next
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"; }; } |