diff options
author | DavHau <hsngrmpf+github@gmail.com> | 2021-04-22 12:31:41 +0700 |
---|---|---|
committer | DavHau <hsngrmpf+github@gmail.com> | 2021-05-04 17:43:46 +0700 |
commit | f94876e77b7de2bfd0960cd53fedf7bac7d998d1 (patch) | |
tree | 271fb74ffee7a113569a13686bbe79c2b28d7167 /pkgs/tools/package-management/nix | |
parent | 118ef67e0743b3b61baab8737e152f31d48b3ddc (diff) |
nixFlakes: enable flakes,nix-command via patch
Diffstat (limited to 'pkgs/tools/package-management/nix')
-rw-r--r-- | pkgs/tools/package-management/nix/default.nix | 11 | ||||
-rw-r--r-- | pkgs/tools/package-management/nix/enable-flakes.patch | 14 |
2 files changed, 17 insertions, 8 deletions
diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix index 46f11322484a1..fa088e04fe547 100644 --- a/pkgs/tools/package-management/nix/default.nix +++ b/pkgs/tools/package-management/nix/default.nix @@ -227,13 +227,8 @@ in rec { inherit storeDir stateDir confDir boehmgc; }); - nixFlakes = callPackage ({ makeWrapper, runCommand, ... }: - runCommand "nix-flakes" { buildInputs = [ makeWrapper ]; } '' - mkdir -p $out/bin - for bin in ${nixUnstable}/bin/*; do - makeWrapper $bin $out/bin/$(basename $bin) \ - --suffix NIX_CONFIG "\n" "experimental-features = nix-command flakes" - done; - '') {}; + nixFlakes = nixUnstable.overrideAttrs (prev: { + patches = (prev.patches or []) ++ [ ./enable-flakes.patch ]; + }); } diff --git a/pkgs/tools/package-management/nix/enable-flakes.patch b/pkgs/tools/package-management/nix/enable-flakes.patch new file mode 100644 index 0000000000000..998067449b7f4 --- /dev/null +++ b/pkgs/tools/package-management/nix/enable-flakes.patch @@ -0,0 +1,14 @@ +diff --git a/src/libstore/globals.hh b/src/libstore/globals.hh +index 3e4ead76c..81d407236 100644 +--- a/src/libstore/globals.hh ++++ b/src/libstore/globals.hh +@@ -923,7 +923,8 @@ public: + value. + )"}; + +- Setting<Strings> experimentalFeatures{this, {}, "experimental-features", ++ Setting<Strings> experimentalFeatures{ ++ this, {"flakes", "nix-command"}, "experimental-features", + "Experimental Nix features to enable."}; + + bool isExperimentalFeatureEnabled(const std::string & name); |