diff options
| author | a-kenji <aks.kenji@protonmail.com> | 2022-03-09 08:52:52 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-03-09 08:52:52 +0100 |
| commit | 1481fdf63fb2adf70aeafc68e0876db1c03b3382 (patch) | |
| tree | dbf1fcf412539d0b4a44f32b8da2c27f68d21e7d | |
| parent | docs(changelog): floating pane mouse select fix (diff) | |
| download | sl0ppij-1481fdf63fb2adf70aeafc68e0876db1c03b3382.tar.gz sl0ppij-1481fdf63fb2adf70aeafc68e0876db1c03b3382.tar.xz sl0ppij-1481fdf63fb2adf70aeafc68e0876db1c03b3382.zip | |
build(nix): apply overrrides correctly (#1194)
Overrides in the global scope dont apply all
attributes for the package in `crate2nix`.
| -rw-r--r-- | nix/crate2nix.nix | 6 | ||||
| -rw-r--r-- | nix/default.nix | 3 |
2 files changed, 7 insertions, 2 deletions
diff --git a/nix/crate2nix.nix b/nix/crate2nix.nix index 14c1e749..435627d4 100644 --- a/nix/crate2nix.nix +++ b/nix/crate2nix.nix @@ -3,6 +3,7 @@ , name , src , postInstall +, nativeBuildInputs , desktopItems , meta }: @@ -20,8 +21,11 @@ let buildRustCrateForPkgs = pkgs: pkgs.buildRustCrate.override { defaultCrateOverrides = pkgs.defaultCrateOverrides // { - inherit postInstall desktopItems meta; # Crate dependency overrides go here + zellij = attrs: { + inherit postInstall desktopItems meta name nativeBuildInputs; + + }; }; }; }; diff --git a/nix/default.nix b/nix/default.nix index a863810a..a904abdb 100644 --- a/nix/default.nix +++ b/nix/default.nix @@ -103,7 +103,8 @@ flake-utils.lib.eachSystem [ # crate2nix - better incremental builds, but uses ifd packages.zellij = pkgs.callPackage ./crate2nix.nix { - inherit crate2nix name src desktopItems postInstall meta; + inherit crate2nix name src desktopItems postInstall + meta nativeBuildInputs; }; # native nixpkgs support - keep supported |