···

       
225
       
225
       
 
       
    };

     

       
226
       
226
       
 
       
    extraPath = [ stage3.pkgs.xz ];

     

       
227
       
227
       
 
       
    overrides = pkgs: {

     

       
228
       
228
       
-
       
      inherit (stage3.pkgs) gettext gnum4 gmp perl glibc;

     

       
228
       
228
       
+
       
      # Zlib has to be inherited and not rebuilt in this stage,

     

       
229
       
229
       
+
       
      # because gcc (since JAR support) already depends on zlib, and

     

       
230
       
230
       
+
       
      # then if we already have a zlib we want to use that for the

     

       
231
       
231
       
+
       
      # other purposes (binutils and top-level pkgs) too.

     

       
232
       
232
       
+
       
      inherit (stage3.pkgs) gettext gnum4 gmp perl glibc zlib;

     

       
229
       
233
       
 
       
    };

     

       
230
       
234
       
 
       
  };

     

       
231
       
235
       
 
       


     
···

       
274
       
278
       
 
       
      inherit (stage4.pkgs)

     

       
275
       
279
       
 
       
        gzip bzip2 xz bash binutils coreutils diffutils findutils gawk

     

       
276
       
280
       
 
       
        glibc gnumake gnused gnutar gnugrep gnupatch patchelf

     

       
277
       
277
       
-
       
        attr acl paxctl;

     

       
281
       
281
       
+
       
        attr acl paxctl zlib;

     

       
278
       
282
       
 
       
    };

     

       
279
       
283
       
 
       
  };

     

       
280
       
284