commit bac3beb820d7401038b1392c5b0b61faa1c2444d · pyrox.dev/nixpkgs

+11 -22

pkgs/development/compilers/zig/generic.nix

···

       142
       142
        
           runHook postInstallCheck

     

       143
       143
        
         '';

     

       144
       144
        
       

     

       145
       145
       -
         passthru = {

     

       146
       146
       -
           hook = callPackage ./hook.nix { zig = finalAttrs.finalPackage; };

     

       147
       147
       -
       

     

       148
       148
       -
           bintools-unwrapped = callPackage ./bintools.nix { zig = finalAttrs.finalPackage; };

     

       149
       149
       -
           bintools = wrapBintoolsWith { bintools = finalAttrs.finalPackage.bintools-unwrapped; };

     

       150
       150
       -
       

     

       151
       151
       -
           cc-unwrapped = callPackage ./cc.nix { zig = finalAttrs.finalPackage; };

     

       152
       152
       -
           cc = wrapCCWith {

     

       153
       153
       -
             cc = finalAttrs.finalPackage.cc-unwrapped;

     

       154
       154
       -
             bintools = finalAttrs.finalPackage.bintools;

     

       155
       155
       -
             extraPackages = [ ];

     

       156
       156
       -
             nixSupport.cc-cflags =

     

       157
       157
       -
               [

     

       158
       158
       -
                 "-target"

     

       159
       159
       -
                 "${stdenv.targetPlatform.system}-${stdenv.targetPlatform.parsed.abi.name}"

     

       160
       160
       -
               ]

     

       161
       161
       -
               ++ lib.optional (

     

       162
       162
       -
                 stdenv.targetPlatform.isLinux && !(stdenv.targetPlatform.isStatic or false)

     

       163
       163
       -
               ) "-Wl,-dynamic-linker=${targetPackages.stdenv.cc.bintools.dynamicLinker}";

     

       164
       164
       -
           };

     

       165
       165
       -
       

     

       166
       166
       -
           stdenv = overrideCC stdenv finalAttrs.finalPackage.cc;

     

       145
       145
       +
         passthru = import ./passthru.nix {

     

       146
       146
       +
           inherit

     

       147
       147
       +
             lib

     

       148
       148
       +
             stdenv

     

       149
       149
       +
             callPackage

     

       150
       150
       +
             wrapCCWith

     

       151
       151
       +
             wrapBintoolsWith

     

       152
       152
       +
             overrideCC

     

       153
       153
       +
             targetPackages

     

       154
       154
       +
             ;

     

       155
       155
       +
           zig = finalAttrs.finalPackage;

     

       167
       156
        
         };

     

       168
       157
        
       

     

       169
       158
        
         meta = {

+33

pkgs/development/compilers/zig/passthru.nix

···

       1
       1
       +
       {

     

       2
       2
       +
         lib,

     

       3
       3
       +
         stdenv,

     

       4
       4
       +
         zig,

     

       5
       5
       +
         callPackage,

     

       6
       6
       +
         wrapCCWith,

     

       7
       7
       +
         wrapBintoolsWith,

     

       8
       8
       +
         overrideCC,

     

       9
       9
       +
         targetPackages,

     

       10
       10
       +
       }:

     

       11
       11
       +
       {

     

       12
       12
       +
         hook = callPackage ./hook.nix { inherit zig; };

     

       13
       13
       +
       

     

       14
       14
       +
         bintools-unwrapped = callPackage ./bintools.nix { inherit zig; };

     

       15
       15
       +
         bintools = wrapBintoolsWith { bintools = zig.bintools-unwrapped; };

     

       16
       16
       +
       

     

       17
       17
       +
         cc-unwrapped = callPackage ./cc.nix { inherit zig; };

     

       18
       18
       +
         cc = wrapCCWith {

     

       19
       19
       +
           cc = zig.cc-unwrapped;

     

       20
       20
       +
           bintools = zig.bintools;

     

       21
       21
       +
           extraPackages = [ ];

     

       22
       22
       +
           nixSupport.cc-cflags =

     

       23
       23
       +
             [

     

       24
       24
       +
               "-target"

     

       25
       25
       +
               "${stdenv.targetPlatform.system}-${stdenv.targetPlatform.parsed.abi.name}"

     

       26
       26
       +
             ]

     

       27
       27
       +
             ++ lib.optional (

     

       28
       28
       +
               stdenv.targetPlatform.isLinux && !(stdenv.targetPlatform.isStatic or false)

     

       29
       29
       +
             ) "-Wl,-dynamic-linker=${targetPackages.stdenv.cc.bintools.dynamicLinker}";

     

       30
       30
       +
         };

     

       31
       31
       +
       

     

       32
       32
       +
         stdenv = overrideCC stdenv zig.cc;

     

       33
       33
       +
       }