Unverified Commit 10d5d619 authored by Jörg Thalheim's avatar Jörg Thalheim Committed by GitHub
Browse files

Merge pull request #213601 from SuperSandro2000/envfs-wsl 

nixos/envfs: use configured environment.usrbinenv and environment.binsh, add extraFallbackPath options
parents e7ee36d0 1c664bef

nixos/modules/tasks/filesystems/envfs.nix

+13 −5
Original line number Diff line number Diff line
@@ -7,11 +7,11 @@ let 
      device = "none";

      fsType = "envfs";

      options = [

        "fallback-path=${pkgs.runCommand "fallback-path" {} ''

        "fallback-path=${pkgs.runCommand "fallback-path" {} (''

          mkdir -p $out

          ln -s ${pkgs.coreutils}/bin/env $out/env

          ln -s ${config.system.build.binsh}/bin/sh $out/sh

        ''}"

          ln -s ${config.environment.usrbinenv} $out/env

          ln -s ${config.environment.binsh} $out/sh

        '' + cfg.extraFallbackPathCommands)}"

      ];

    };

    "/bin" = {
@@ -31,11 +31,19 @@ in { 
          etc.

        '';

      };



      package = lib.mkOption {

        type = lib.types.package;

        description = lib.mdDoc "Which package to use for the envfs.";

        default = pkgs.envfs;

        defaultText = lib.literalExpression "pkgs.envfs";

        description = lib.mdDoc "Which package to use for the envfs.";

      };



      extraFallbackPathCommands = lib.mkOption {

        type = lib.types.lines;

        default = "";

        example = "ln -s $''{pkgs.bash}/bin/bash $out/bash";

        description = lib.mdDoc "Extra commands to run in the package that contains fallback executables in case not other executable is found";

      };

    };

  };