commit a782b890d53b5c8a336677bb7c5394f9afb4c39b · pyrox.dev/nixpkgs

+4 -1

nixos/lib/make-system-tarball.nix

···

       16
       16
        
         # symlink to `object' that will be added to the tarball.

     

       17
       17
        
         storeContents ? []

     

       18
       18
        
       

     

       19
       19
       +
         # Extra commands to be executed before archiving files

     

       20
       20
       +
       , extraCommands ? ""

     

       21
       21
       +
       

     

       19
       22
        
         # Extra tar arguments

     

       20
       23
        
       , extraArgs ? ""

     

       21
       24
        
       }:

     
···

       25
       28
        
         builder = ./make-system-tarball.sh;

     

       26
       29
        
         buildInputs = [perl xz];

     

       27
       30
        
       

     

       28
       28
       -
         inherit fileName pathsFromGraph extraArgs;

     

       31
       31
       +
         inherit fileName pathsFromGraph extraArgs extraCommands;

     

       29
       32
        
       

     

       30
       33
        
         # !!! should use XML.

     

       31
       34
        
         sources = map (x: x.source) contents;

+3 -1

nixos/lib/make-system-tarball.sh

···

       33
       33
        
       done

     

       34
       34
        
       

     

       35
       35
        
       

     

       36
       36
       -
       # TODO tar ruxo 

     

       36
       36
       +
       # TODO tar ruxo

     

       37
       37
        
       # Also include a manifest of the closures in a format suitable for

     

       38
       38
        
       # nix-store --load-db.

     

       39
       39
        
       printRegistration=1 perl $pathsFromGraph closure-* > nix-path-registration

     
···

       47
       47
        
               ln -s $object ./$symlink

     

       48
       48
        
           fi

     

       49
       49
        
       done

     

       50
       50
       +
       

     

       51
       51
       +
       $extraCommands

     

       50
       52
        
       

     

       51
       53
        
       mkdir -p $out/tarball

     

       52
       54