diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix
index ac61a64180d..46f11322484 100644
--- a/pkgs/tools/package-management/nix/default.nix
+++ b/pkgs/tools/package-management/nix/default.nix
@@ -227,6 +227,13 @@ in rec {
     inherit storeDir stateDir confDir boehmgc;
   });
 
-  nixFlakes = nixUnstable;
+  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;
+    '') {};
 
 }