commit 1620104ec6c1e40f8a55fd8459730f3e186f8950 · pyrox.dev/nixpkgs

-5

pkgs/build-support/nuke-references/darwin-sign-fixup.sh

···

       1
       1
       -
       # Fixup hook for nukeReferences, not stdenv

     

       2
       2
       -
       

     

       3
       3
       -
       source @signingUtils@

     

       4
       4
       -
       

     

       5
       5
       -
       fixupHooks+=(signIfRequired)

+3 -12

pkgs/build-support/nuke-references/default.nix

···

       11
       11
        
         shell ? stdenvNoCC.shell,

     

       12
       12
        
       }:

     

       13
       13
        
       

     

       14
       14
       -
       let

     

       15
       15
       -
         stdenv = stdenvNoCC;

     

       16
       16
       -
       

     

       17
       17
       -
         darwinCodeSign = stdenv.targetPlatform.isDarwin && stdenv.targetPlatform.isAarch64;

     

       18
       18
       -
       in

     

       19
       19
       -
       

     

       20
       14
        
       stdenvNoCC.mkDerivation {

     

       21
       15
        
         name = "nuke-references";

     

       22
       16
        
       

     
···

       32
       26
        
           chmod a+x $out/bin/nuke-refs

     

       33
       27
        
         '';

     

       34
       28
        
       

     

       35
       35
       -
         postFixup = lib.optionalString darwinCodeSign ''

     

       36
       36
       -
           mkdir -p $out/nix-support

     

       37
       37
       -
           substituteAll ${./darwin-sign-fixup.sh} $out/nix-support/setup-hooks.sh

     

       38
       38
       -
         '';

     

       39
       39
       -
       

     

       40
       29
        
         # FIXME: get rid of perl dependency.

     

       41
       30
        
         env = {

     

       42
       31
        
           inherit perl;

     

       43
       32
        
           inherit (builtins) storeDir;

     

       44
       33
        
           shell = lib.getBin shell + (shell.shellPath or "");

     

       45
       45
       -
           signingUtils = lib.optionalString darwinCodeSign signingUtils;

     

       34
       34
       +
           signingUtils = lib.optionalString (

     

       35
       35
       +
             stdenvNoCC.targetPlatform.isDarwin && stdenvNoCC.targetPlatform.isAarch64

     

       36
       36
       +
           ) signingUtils;

     

       46
       37
        
         };

     

       47
       38
        
       

     

       48
       39
        
         meta.mainProgram = "nuke-refs";

+5 -6

pkgs/build-support/nuke-references/nuke-refs.sh

···

       2
       2
        
       

     

       3
       3
        
       fixupHooks=()

     

       4
       4
        
       

     

       5
       5
       -
       if [ -e @out@/nix-support/setup-hooks.sh ]; then

     

       6
       6
       -
           source @out@/nix-support/setup-hooks.sh

     

       5
       5
       +
       if [[ -n "@signingUtils@" ]]; then

     

       6
       6
       +
           source "@signingUtils@"

     

       7
       7
        
       fi

     

       8
       8
        
       

     

       9
       9
        
       excludes=""

     
···

       25
       25
        
               cat "$i" | @perl@/bin/perl -pe "s|\Q@storeDir@\E/$excludes[a-z0-9]{32}-|@storeDir@/eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee-|g" > "$i.tmp"

     

       26
       26
        
               if test -x "$i"; then chmod +x "$i.tmp"; fi

     

       27
       27
        
               mv "$i.tmp" "$i"

     

       28
       28
       -
       

     

       29
       29
       -
               for hook in "${fixupHooks[@]}"; do

     

       30
       30
       -
                   eval "$hook" "$i"

     

       31
       31
       -
               done

     

       28
       28
       +
               if [[ -n "@signingUtils@" ]]; then

     

       29
       29
       +
                   signIfRequired "$i"

     

       30
       30
       +
               fi

     

       32
       31
        
           fi

     

       33
       32
        
       done

-5

pkgs/build-support/remove-references-to/darwin-sign-fixup.sh

···

       1
       1
       -
       # Fixup hook for nukeReferences, not stdenv

     

       2
       2
       -
       

     

       3
       3
       -
       source @signingUtils@

     

       4
       4
       -
       

     

       5
       5
       -
       fixupHooks+=(signIfRequired)

+5 -14

pkgs/build-support/remove-references-to/default.nix

···

       10
       10
        
         shell ? stdenvNoCC.shell,

     

       11
       11
        
       }:

     

       12
       12
        
       

     

       13
       13
       -
       let

     

       14
       14
       -
         stdenv = stdenvNoCC;

     

       15
       15
       -
       

     

       16
       16
       -
         darwinCodeSign = stdenv.targetPlatform.isDarwin && stdenv.targetPlatform.isAarch64;

     

       17
       17
       -
       in

     

       18
       18
       -
       

     

       19
       19
       -
       stdenv.mkDerivation {

     

       13
       13
       +
       stdenvNoCC.mkDerivation {

     

       20
       14
        
         name = "remove-references-to";

     

       21
       15
        
       

     

       22
       16
        
         dontUnpack = true;

     
···

       29
       23
        
           chmod a+x $out/bin/remove-references-to

     

       30
       24
        
         '';

     

       31
       25
        
       

     

       32
       32
       -
         postFixup = lib.optionalString darwinCodeSign ''

     

       33
       33
       -
           mkdir -p $out/nix-support

     

       34
       34
       -
           substituteAll ${./darwin-sign-fixup.sh} $out/nix-support/setup-hooks.sh

     

       35
       35
       -
         '';

     

       36
       36
       -
       

     

       37
       26
        
         env = {

     

       38
       27
        
           inherit (builtins) storeDir;

     

       39
       28
        
           shell = lib.getBin shell + (shell.shellPath or "");

     

       40
       40
       -
         }

     

       41
       41
       -
         // lib.optionalAttrs darwinCodeSign { inherit signingUtils; };

     

       29
       29
       +
           signingUtils = lib.optionalString (

     

       30
       30
       +
             stdenvNoCC.targetPlatform.isDarwin && stdenvNoCC.targetPlatform.isAarch64

     

       31
       31
       +
           ) signingUtils;

     

       32
       32
       +
         };

     

       42
       33
        
       

     

       43
       34
        
         meta.mainProgram = "remove-references-to";

     

       44
       35
        
       }

+5 -8

pkgs/build-support/remove-references-to/remove-references-to.sh

···

       2
       2
        
       

     

       3
       3
        
       fixupHooks=()

     

       4
       4
        
       

     

       5
       5
       -
       if [ -e @out@/nix-support/setup-hooks.sh ]; then

     

       6
       6
       -
           source @out@/nix-support/setup-hooks.sh

     

       7
       7
       -
       fi

     

       8
       8
       -
       

     

       9
       5
        
       # References to remove

     

       10
       6
        
       targets=()

     

       11
       7
        
       while getopts t: o; do

     
···

       30
       26
        
           sed -i -e "s|$target|eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee|g" "${regions[@]}"

     

       31
       27
        
       done

     

       32
       28
        
       

     

       33
       33
       -
       for region in "${regions[@]}"; do

     

       34
       34
       -
           for hook in "${fixupHooks[@]}"; do

     

       35
       35
       -
               eval "$hook" "$region"

     

       29
       29
       +
       if [[ -n "@signingUtils@" ]]; then

     

       30
       30
       +
           source "@signingUtils@"

     

       31
       31
       +
           for region in "${regions[@]}"; do

     

       32
       32
       +
               signIfRequired "$region"

     

       36
       33
        
           done

     

       37
       37
       -
       done

     

       34
       34
       +
       fi