Skip to content

Commit

Permalink
Allow using override to add features
Browse files Browse the repository at this point in the history
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.
  • Loading branch information
KoviRobi committed Dec 4, 2024
1 parent f9f2aae commit 77d2292
Showing 1 changed file with 1 addition and 7 deletions.
8 changes: 1 addition & 7 deletions default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -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;
});
Expand Down

0 comments on commit 77d2292

Please sign in to comment.