From 77d2292e5c7b9d9a87f696710b06b3a98025f8d2 Mon Sep 17 00:00:00 2001 From: Kovacsics Robert Date: Wed, 4 Dec 2024 19:16:59 +0000 Subject: [PATCH] Allow using `override` to add features This way you can do ```nix himalaya.override { buildFeatures = [ "notmuch" "oauth2" ]; } ``` Also this uses any unspecified arguments as if they were given from `pkgs`, so no need to explicitly specify. --- default.nix | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/default.nix b/default.nix index 7601f57a..f8add8b6 100644 --- a/default.nix +++ b/default.nix @@ -5,17 +5,11 @@ pimalaya.mkDefault ({ src = ./.; version = "1.0.0"; - mkPackage = ({ lib, pkgs, rustPlatform, defaultFeatures, features }: import ./package.nix { + mkPackage = ({ lib, pkgs, rustPlatform, defaultFeatures, features }: pkgs.callPackage ./package.nix { inherit lib rustPlatform; - fetchFromGitHub = pkgs.fetchFromGitHub; - stdenv = pkgs.stdenv; apple-sdk = if pkgs.hostPlatform.isx86_64 then pkgs.apple-sdk_13 else pkgs.apple-sdk_14; - installShellFiles = pkgs.installShellFiles; installShellCompletions = false; installManPages = false; - notmuch = pkgs.notmuch; - gpgme = pkgs.gpgme; - pkg-config = pkgs.pkg-config; buildNoDefaultFeatures = !defaultFeatures; buildFeatures = lib.splitString "," features; });