commit d38784184371f921e1e4db92d417f42a4f3c2089 · pyrox.dev/nixpkgs

+1 -1

pkgs/build-support/rust/hooks/cargo-build-hook.sh

···

       19
       19
        
       

     

       20
       20
        
           local flagsArray=(

     

       21
       21
        
               "-j" "$NIX_BUILD_CORES"

     

       22
       22
       -
               "--target" "@rustcTarget@"

     

       22
       22
       +
               "--target" "@rustcTargetSpec@"

     

       23
       23
        
               "--offline"

     

       24
       24
        
           )

     

       25
       25

+1 -1

pkgs/build-support/rust/hooks/cargo-check-hook.sh

···

       29
       29
        
           fi

     

       30
       30
        
       

     

       31
       31
        
           flagsArray+=(

     

       32
       32
       -
               "--target" "@rustcTarget@"

     

       32
       32
       +
               "--target" "@rustcTargetSpec@"

     

       33
       33
        
               "--offline"

     

       34
       34
        
           )

     

       35
       35

+1 -1

pkgs/build-support/rust/hooks/cargo-nextest-hook.sh

···

       10
       10
        
           fi

     

       11
       11
        
       

     

       12
       12
        
           local flagsArray=(

     

       13
       13
       -
               "--target" "@rustcTarget@"

     

       13
       13
       +
               "--target" "@rustcTargetSpec@"

     

       14
       14
        
               "--offline"

     

       15
       15
        
           )

     

       16
       16

+4 -4

pkgs/build-support/rust/hooks/default.nix

···

       20
       20
        
         cargoBuildHook = makeSetupHook {

     

       21
       21
        
           name = "cargo-build-hook.sh";

     

       22
       22
        
           substitutions = {

     

       23
       23
       -
             inherit (stdenv.targetPlatform.rust) rustcTarget;

     

       23
       23
       +
             inherit (stdenv.targetPlatform.rust) rustcTargetSpec;

     

       24
       24
        
             inherit (rust.envVars) setEnv;

     

       25
       25
        
       

     

       26
       26
        
           };

     
···

       35
       35
        
         cargoCheckHook = makeSetupHook {

     

       36
       36
        
           name = "cargo-check-hook.sh";

     

       37
       37
        
           substitutions = {

     

       38
       38
       -
             inherit (stdenv.targetPlatform.rust) rustcTarget;

     

       38
       38
       +
             inherit (stdenv.targetPlatform.rust) rustcTargetSpec;

     

       39
       39
        
             inherit (rust.envVars) setEnv;

     

       40
       40
        
           };

     

       41
       41
        
           passthru.tests = {

     
···

       63
       63
        
           name = "cargo-nextest-hook.sh";

     

       64
       64
        
           propagatedBuildInputs = [ cargo-nextest ];

     

       65
       65
        
           substitutions = {

     

       66
       66
       -
             inherit (stdenv.targetPlatform.rust) rustcTarget;

     

       66
       66
       +
             inherit (stdenv.targetPlatform.rust) rustcTargetSpec;

     

       67
       67
        
           };

     

       68
       68
        
           passthru.tests = {

     

       69
       69
        
             test = tests.rust-hooks.cargoNextestHook;

     
···

       121
       121
        
             pkgsHostTarget.rustc

     

       122
       122
        
           ];

     

       123
       123
        
           substitutions = {

     

       124
       124
       -
             inherit (stdenv.targetPlatform.rust) rustcTarget;

     

       124
       124
       +
             inherit (stdenv.targetPlatform.rust) rustcTargetSpec;

     

       125
       125
        
             inherit (rust.envVars) setEnv;

     

       126
       126
        
       

     

       127
       127
        
           };

+1 -1

pkgs/build-support/rust/hooks/maturin-build-hook.sh

···

       20
       20
        
           local flagsArray=(

     

       21
       21
        
               "--jobs=$NIX_BUILD_CORES"

     

       22
       22
        
               "--offline"

     

       23
       23
       -
               "--target" "@rustcTarget@"

     

       23
       23
       +
               "--target" "@rustcTargetSpec@"

     

       24
       24
        
               "--manylinux" "off"

     

       25
       25
        
               "--strip"

     

       26
       26
        
               "--release"