commit 491e5d8649e8587654a81baf119e3b66bce65102 · pyrox.dev/nixpkgs

+3

pkgs/development/compilers/rust/bootstrap.nix

···

       9
       9
        
         hashes = {

     

       10
       10
        
           i686-unknown-linux-gnu = "abe592e06616cdc2fcca56ddbe482050dd49a1fada35e2af031c64fe6eb14668";

     

       11
       11
        
           x86_64-unknown-linux-gnu = "ca1cf3aed73ff03d065a7d3e57ecca92228d35dc36d9274a6597441319f18eb8";

     

       12
       12
       +
           aarch64-unknown-linux-gnu = "eaab3df489d4d8f976c4327d812b9870730eed6d0bbd52712767083d02be7472";

     

       12
       13
        
           i686-apple-darwin = "b3c2470f8f132d285e6c989681e251592b67071bc9d93cac8a2e6b66f7bdfcb5";

     

       13
       14
        
           x86_64-apple-darwin = "fa1fb8896d5e327cbe6deeb50e6e9a3346de629f2e6bcbd8c10f19f3e2ed67d5";

     

       14
       15
        
         };

     
···

       18
       19
        
           then "i686-unknown-linux-gnu"

     

       19
       20
        
           else if stdenv.system == "x86_64-linux"

     

       20
       21
        
           then "x86_64-unknown-linux-gnu"

     

       22
       22
       +
           else if stdenv.system == "aarch64-linux"

     

       23
       23
       +
           then "aarch64-unknown-linux-gnu"

     

       21
       24
        
           else if stdenv.system == "i686-darwin"

     

       22
       25
        
           then "i686-apple-darwin"

     

       23
       26
        
           else if stdenv.system == "x86_64-darwin"

+3 -1

pkgs/development/compilers/rust/default.nix

···

       23
       23
        
       

     

       24
       24
        
           patches = [

     

       25
       25
        
             ./patches/0001-Disable-fragile-tests-libstd-net-tcp-on-Darwin-Linux.patch

     

       26
       26
       -
           ] ++ stdenv.lib.optional stdenv.needsPax ./patches/grsec.patch;

     

       26
       26
       +
           ] ++ stdenv.lib.optional stdenv.needsPax ./patches/grsec.patch

     

       27
       27
       +
             # https://github.com/rust-lang/rust/issues/45410

     

       28
       28
       +
             ++ stdenv.lib.optional stdenv.isAarch64 ./patches/aarch64-disable-test_loading_cosine.patch;

     

       27
       29
        
       

     

       28
       30
        
         };

     

       29
       31

+12

pkgs/development/compilers/rust/patches/aarch64-disable-test_loading_cosine.patch

···

       1
       1
       +
       diff --git a/src/librustc_back/dynamic_lib.rs b/src/librustc_back/dynamic_lib.rs

     

       2
       2
       +
       index 1b42fa0..92256dc 100644

     

       3
       3
       +
       --- a/src/librustc_back/dynamic_lib.rs

     

       4
       4
       +
       +++ b/src/librustc_back/dynamic_lib.rs

     

       5
       5
       +
       @@ -80,6 +80,7 @@ mod tests {

     

       6
       6
       +
            use std::mem;

     

       7
       7
       +
        

     

       8
       8
       +
            #[test]

     

       9
       9
       +
       +    #[ignore]

     

       10
       10
       +
            fn test_loading_cosine() {

     

       11
       11
       +
                if cfg!(windows) {

     

       12
       12
       +
                    return

+1

pkgs/development/compilers/rust/print-hashes.sh

···

       10
       10
        
       PLATFORMS=(

     

       11
       11
        
         i686-unknown-linux-gnu

     

       12
       12
        
         x86_64-unknown-linux-gnu

     

       13
       13
       +
         aarch64-unknown-linux-gnu

     

       13
       14
        
         i686-apple-darwin

     

       14
       15
        
         x86_64-apple-darwin

     

       15
       16
        
       )

+3

pkgs/development/compilers/rust/rustc.nix

···

       34
       34
        
       

     

       35
       35
        
         __darwinAllowLocalNetworking = true;

     

       36
       36
        
       

     

       37
       37
       +
         # The build will fail at the very end on AArch64 without this.

     

       38
       38
       +
         dontUpdateAutotoolsGnuConfigScripts = if stdenv.isAarch64 then true else null;

     

       39
       39
       +
       

     

       37
       40
        
         NIX_LDFLAGS = optionalString stdenv.isDarwin "-rpath ${llvmShared}/lib";

     

       38
       41
        
       

     

       39
       42
        
         # Enable nightly features in stable compiles (used for