Commit b3561f17 authored by Robert Hensing's avatar Robert Hensing
Browse files

devShellTools.unstructuredDerivationInputEnv: Support older Nix

parent 41260169

pkgs/build-support/dev-shell-tools/default.nix

+8 −4
Original line number Diff line number Diff line
@@ -31,10 +31,14 @@ rec { 
        in if lib.elem name (drvAttrs.passAsFile or [])

        then

          let

            nameHash = builtins.convertHash {

            nameHash =

              if builtins?convertHash

              then builtins.convertHash {

                hash = "sha256:" + builtins.hashString "sha256" name;

                toHashFormat = "nix32";

            };

              }

              else

                builtins.hashString "sha256" name;

            basename = ".attr-${nameHash}";

          in

            lib.nameValuePair "${name}Path" "${

pkgs/build-support/dev-shell-tools/tests/default.nix

+3 −1
Original line number Diff line number Diff line
@@ -149,7 +149,9 @@ lib.recurseIntoAttrs { 


          diff $exampleBarPathString $barPath



          ${lib.optionalString (builtins?convertHash) ''

            [[ "$(basename $exampleBarPathString)" = "$(basename $barPath)" ]]

          ''}

        )



        ''${args:+fail "args should not be set by Nix. We don't expect it to and unstructuredDerivationInputEnv removes it."}