From 7183c8056feb4ce9e5b4cee3fc67c8607d515905 Mon Sep 17 00:00:00 2001 From: Aliaksandr Date: Sat, 27 Dec 2025 01:01:16 +0200 Subject: [PATCH] {vanillatd,vanillara}: use explicit default values, remove override in all-packages.nix --- pkgs/by-name/va/vanillatd/package.nix | 2 +- pkgs/top-level/all-packages.nix | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/va/vanillatd/package.nix b/pkgs/by-name/va/vanillatd/package.nix index 5d5ccf4b8147..7cff83871c5a 100644 --- a/pkgs/by-name/va/vanillatd/package.nix +++ b/pkgs/by-name/va/vanillatd/package.nix @@ -24,7 +24,7 @@ symlinkJoin, rsync, - appName, + appName ? "vanillatd", CMAKE_BUILD_TYPE ? "RelWithDebInfo", # "Choose the type of build, recommended options are: Debug Release RelWithDebInfo" }: assert lib.assertOneOf "appName" appName [ diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5ab11ab15070..193700c13c87 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12049,9 +12049,7 @@ with pkgs; pmars-x11 = pmars.override { enableXwinGraphics = true; }; - vanillatd = callPackage ../by-name/va/vanillatd/package.nix { appName = "vanillatd"; }; - - vanillara = callPackage ../by-name/va/vanillatd/package.nix { appName = "vanillara"; }; + vanillara = vanillatd.override { appName = "vanillara"; }; anki-utils = callPackage ../by-name/an/anki/addons/anki-utils.nix { }; ankiAddons = recurseIntoAttrs (callPackage ../by-name/an/anki/addons { });