Unverified Commit 505e9425 authored by Vladimír Čunát's avatar Vladimír Čunát
Browse files

stdenv: resurrect the allowedRequisites check

Discovered in #28091.  I'm sorry I forgot to re-check my TODOs, long ago.
parent 6899c7fd
Loading
Loading
Loading
Loading
+15 −7
Original line number Diff line number Diff line
@@ -299,13 +299,21 @@ in
        shellPackage = prevStage.bash;
      };

      /* outputs TODO
      allowedRequisites = with prevStage;
      # Mainly avoid reference to bootstrap tools
      allowedRequisites = with prevStage; with lib;
        # Simple executable tools
        concatMap (p: [ (getBin p) (getLib p) ])
          [ gzip bzip2 xz bash binutils coreutils diffutils findutils gawk
          glibc gnumake gnused gnutar gnugrep gnupatch patchelf attr acl
          paxctl zlib pcre linuxHeaders ed gcc gcc.cc libsigsegv
        ] ++ lib.optional (system == "aarch64-linux") prevStage.updateAutotoolsGnuConfigScriptsHook;
        */
            gnumake gnused gnutar gnugrep gnupatch patchelf ed paxctl
          ]
        # Library dependencies
        ++ map getLib [ attr acl zlib pcre libsigsegv ]
        # More complicated cases
        ++ [
            glibc.out glibc.dev glibc.bin/*propagated from .dev*/ linuxHeaders
            gcc gcc.cc gcc.cc.lib gcc.expandResponseParams
          ]
        ++ lib.optional (system == "aarch64-linux") prevStage.updateAutotoolsGnuConfigScriptsHook;

      overrides = self: super: {
        inherit (prevStage)