commit ffb57b96ebcbd585b2204e084c48cb31b6d7e716 · pyrox.dev/nixpkgs

+4 -4

pkgs/development/compilers/emscripten/default.nix

···

       18
       18
        
       

     

       19
       19
        
       stdenv.mkDerivation rec {

     

       20
       20
        
         pname = "emscripten";

     

       21
       21
       -
         version = "4.0.11";

     

       21
       21
       +
         version = "4.0.12";

     

       22
       22
        
       

     

       23
       23
        
         llvmEnv = symlinkJoin {

     

       24
       24
        
           name = "emscripten-llvm-${version}";

     
···

       47
       47
        
         src = fetchFromGitHub {

     

       48
       48
        
           owner = "emscripten-core";

     

       49
       49
        
           repo = "emscripten";

     

       50
       50
       -
           hash = "sha256-QNbXgTkzI0fqvg3nU2TAE8A8h6MNMm2TsTzOXBdpqYA=";

     

       50
       50
       +
           hash = "sha256-MwCUilfyum1yJb6nHEViYiYWufXlz2+krHZmXw2NAck=";

     

       51
       51
        
           rev = version;

     

       52
       52
        
         };

     

       53
       53
        
       

     
···

       68
       68
        
       

     

       69
       69
        
           patchShebangs .

     

       70
       70
        
       

     

       71
       71
       -
           # emscripten 4 requires LLVM tip-of-tree instead of LLVM 20

     

       72
       72
       -
           sed -i -e "s/EXPECTED_LLVM_VERSION = 21/EXPECTED_LLVM_VERSION = 20.1/g" tools/shared.py

     

       71
       71
       +
           # emscripten 4.0.12 requires LLVM tip-of-tree instead of LLVM 21

     

       72
       72
       +
           sed -i -e "s/EXPECTED_LLVM_VERSION = 22/EXPECTED_LLVM_VERSION = 21.1/g" tools/shared.py

     

       73
       73
        
       

     

       74
       74
        
           # fixes cmake support

     

       75
       75
        
           sed -i -e "s/print \('emcc (Emscript.*\)/sys.stderr.write(\1); sys.stderr.flush()/g" emcc.py

+1 -1

pkgs/top-level/all-packages.nix

···

       2818
       2818
        
         buildEmscriptenPackage = callPackage ../development/em-modules/generic { };

     

       2819
       2819
        
       

     

       2820
       2820
        
         emscripten = callPackage ../development/compilers/emscripten {

     

       2821
       2821
       -
           llvmPackages = llvmPackages_20;

     

       2821
       2821
       +
           llvmPackages = llvmPackages_21;

     

       2822
       2822
        
         };

     

       2823
       2823
        
       

     

       2824
       2824
        
         emscriptenPackages = recurseIntoAttrs (callPackage ./emscripten-packages.nix { });