From cb946df8b9cf7c62fab3d163c06546ee22c4fc85 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Wed, 27 Sep 2023 15:02:21 +0200 Subject: [PATCH] only pass experimental-features onces to nix-build --- pkgs/clan-cli/clan_cli/nix.py | 4 +--- pkgs/clan-cli/default.nix | 2 +- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/pkgs/clan-cli/clan_cli/nix.py b/pkgs/clan-cli/clan_cli/nix.py index 84fd73da5..247183348 100644 --- a/pkgs/clan-cli/clan_cli/nix.py +++ b/pkgs/clan-cli/clan_cli/nix.py @@ -8,7 +8,7 @@ from .dirs import nixpkgs_flake, nixpkgs_source def nix_command(flags: list[str]) -> list[str]: - return ["nix", "--experimental-features", "nix-command flakes"] + flags + return ["nix", "--extra-experimental-features", "nix-command flakes"] + flags def nix_build( @@ -20,8 +20,6 @@ def nix_build( "build", "--no-link", "--print-out-paths", - "--extra-experimental-features", - "nix-command flakes", ] ) + flags diff --git a/pkgs/clan-cli/default.nix b/pkgs/clan-cli/default.nix index 8adff94b2..2a8952681 100644 --- a/pkgs/clan-cli/default.nix +++ b/pkgs/clan-cli/default.nix @@ -89,7 +89,7 @@ let ln -s ${nixpkgs} $out/path nix flake lock $out \ --store ./. \ - --experimental-features 'nix-command flakes' \ + --extra-experimental-features 'nix-command flakes' \ --override-input nixpkgs ${nixpkgs} ''; in