pogmommy/zellij
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

build(nix): apply overrrides correctly (#1194)

Browse source 
Overrides in the global scope dont apply all
attributes for the package in `crate2nix`.
This commit is contained in:
a-kenji 2022-03-09 08:52:52 +01:00 • committed by GitHub
parent ef8f3d1f56
commit 1481fdf63f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
nix/crate2nix.nix
View file

@ -3,6 +3,7 @@
, name , name
, src , src
, postInstall , postInstall
, nativeBuildInputs
, desktopItems , desktopItems
, meta , meta
}: }:
@ -20,8 +21,11 @@ let
buildRustCrateForPkgs = pkgs: buildRustCrateForPkgs = pkgs:
pkgs.buildRustCrate.override { pkgs.buildRustCrate.override {
defaultCrateOverrides = pkgs.defaultCrateOverrides // { defaultCrateOverrides = pkgs.defaultCrateOverrides // {
inherit postInstall desktopItems meta;
# Crate dependency overrides go here # Crate dependency overrides go here
zellij = attrs: {
inherit postInstall desktopItems meta name nativeBuildInputs;
};
}; };
}; };
}; };

3
nix/default.nix
View file

@ -103,7 +103,8 @@ flake-utils.lib.eachSystem [
# crate2nix - better incremental builds, but uses ifd # crate2nix - better incremental builds, but uses ifd
packages.zellij = pkgs.callPackage ./crate2nix.nix { 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 # native nixpkgs support - keep supported