ecoppens/colmena
1
0
Fork 0
forked from DGNum/colmena
Code Pull requests Activity

package.nix: Remove conditionals on nix-eval-jobs

Browse source
This commit is contained in:
Zhaofeng Li 2022-04-03 17:16:01 -07:00
parent 9f7f2c9cce
commit 11289dd7ff
2 changed files with 3 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
integration-tests/nixpkgs-stable.nix
View file

@ -3,12 +3,5 @@ let
in import flake.inputs.stable.outPath { in import flake.inputs.stable.outPath {
overlays = [ overlays = [
flake.overlay flake.overlay
# Our nix-eval-jobs patch cannot be applied to 0.0.1
(final: prev: {
colmena = prev.colmena.override {
nix-eval-jobs = null;
};
})
]; ];
} }

6
package.nix
View file

@ -1,4 +1,4 @@
{ lib, stdenv, rustPlatform, installShellFiles, nix-eval-jobs ? null }: { lib, stdenv, rustPlatform, installShellFiles, nix-eval-jobs }:
rustPlatform.buildRustPackage rec { rustPlatform.buildRustPackage rec {
pname = "colmena"; pname = "colmena";
@ -13,9 +13,9 @@ rustPlatform.buildRustPackage rec {
nativeBuildInputs = [ installShellFiles ]; nativeBuildInputs = [ installShellFiles ];
propagatedBuildInputs = lib.optional (nix-eval-jobs != null) nix-eval-jobs; buildInputs = [ nix-eval-jobs ];
NIX_EVAL_JOBS = lib.optionalString (nix-eval-jobs != null) "${nix-eval-jobs}/bin/nix-eval-jobs"; NIX_EVAL_JOBS = "${nix-eval-jobs}/bin/nix-eval-jobs";
preBuild = '' preBuild = ''
if [[ -z "$NIX_EVAL_JOBS" ]]; then if [[ -z "$NIX_EVAL_JOBS" ]]; then