Unverified Commit d0d5a7a1 authored by Philip Taron's avatar Philip Taron
Browse files

freshBootstrapTools: extract bootstrapFiles as a passthru on its core derivation

parent d7c66f09

pkgs/stdenv/darwin/make-bootstrap-tools.nix

+1 −6
Original line number Diff line number Diff line
@@ -25,12 +25,7 @@ in 


rec {

  build = pkgs.callPackage ./stdenv-bootstrap-tools.nix { };

  bootstrapFiles = {

    bootstrapTools = "${build}/on-server/bootstrap-tools.tar.xz";

    unpack = pkgs.runCommand "unpack" { allowedReferences = []; } ''

      cp -r ${build}/unpack $out

    '';

  };

  inherit (build) bootstrapFiles;



  bootstrapTools = pkgs.callPackage ./bootstrap-tools.nix {

    inherit (bootstrapFiles) bootstrapTools unpack;

pkgs/stdenv/darwin/stdenv-bootstrap-tools.nix

+12 −2
Original line number Diff line number Diff line
@@ -29,12 +29,13 @@ 
  openssl,

  patch,

  pbzx,

  runCommand,

  writeText,

  xar,

  xz,

  zlib,

}:

stdenv.mkDerivation {

stdenv.mkDerivation (finalAttrs: {

  name = "stdenv-bootstrap-tools";



  nativeBuildInputs = [
@@ -290,7 +291,16 @@ stdenv.mkDerivation { 


  allowedReferences = [ ];



  passthru = {

    bootstrapFiles = {

      bootstrapTools = "${finalAttrs.finalPackage}/on-server/bootstrap-tools.tar.xz";

      unpack = runCommand "unpack" { allowedReferences = [ ]; } ''

        cp -r ${finalAttrs.finalPackage}/unpack $out

      '';

    };

  };



  meta = {

    maintainers = [ lib.maintainers.copumpkin ];

  };

}
 
})