From 11289dd7ff71f75bd252525167c5a9f685c06bcf Mon Sep 17 00:00:00 2001 From: Zhaofeng Li Date: Sun, 3 Apr 2022 17:16:01 -0700 Subject: [PATCH] package.nix: Remove conditionals on nix-eval-jobs --- integration-tests/nixpkgs-stable.nix | 7 ------- package.nix | 6 +++--- 2 files changed, 3 insertions(+), 10 deletions(-) diff --git a/integration-tests/nixpkgs-stable.nix b/integration-tests/nixpkgs-stable.nix index 26c9fb0..da06033 100644 --- a/integration-tests/nixpkgs-stable.nix +++ b/integration-tests/nixpkgs-stable.nix @@ -3,12 +3,5 @@ let in import flake.inputs.stable.outPath { overlays = [ flake.overlay - - # Our nix-eval-jobs patch cannot be applied to 0.0.1 - (final: prev: { - colmena = prev.colmena.override { - nix-eval-jobs = null; - }; - }) ]; } diff --git a/package.nix b/package.nix index 0dba9a0..1be53cf 100644 --- a/package.nix +++ b/package.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, rustPlatform, installShellFiles, nix-eval-jobs ? null }: +{ lib, stdenv, rustPlatform, installShellFiles, nix-eval-jobs }: rustPlatform.buildRustPackage rec { pname = "colmena"; @@ -13,9 +13,9 @@ rustPlatform.buildRustPackage rec { 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 = '' if [[ -z "$NIX_EVAL_JOBS" ]]; then