Merge remote-tracking branch 'origin/master' into markdown

1 files changed, 3 insertions, 6 deletions

diff --git a/flake.nix b/flake.nix
index 3f67bfd40..286cab792 100644
--- a/flake.nix
+++ b/flake.nix
@@ -442,6 +442,8 @@
         stdenv.mkDerivation {
           name = "nix";
 
+          outputs = [ "out" "dev" "doc" ];
+
           buildInputs = buildDeps ++ propagatedDeps ++ perlDeps;
 
           inherit configureFlags;
@@ -452,12 +454,7 @@
 
           shellHook =
             ''
-              export prefix=$(pwd)/inst
-              configureFlags+=" --prefix=$prefix"
-              PKG_CONFIG_PATH=$prefix/lib/pkgconfig:$PKG_CONFIG_PATH
-              PATH=$prefix/bin:$PATH
-              export MANPATH=/home/eelco/Dev/nix/inst/share/man:$MANPATH
-              unset PYTHONPATH
+              export MANPATH=$out/share/man:$MANPATH
             '';
         });