commit 6c3610fafc14f054b059182b443553b9cfd5c278 · pyrox.dev/nixpkgs

+6 -6

pkgs/development/compilers/dotnet/packages.nix

···

       54
       54
        
       

     

       55
       55
        
               mkdir -p "$out"

     

       56
       56
        
       

     

       57
       57
       -
               pushd "$src"/Private.SourceBuilt.Artifacts.*.${targetRid}

     

       57
       57
       +
               pushd "$src"/lib/Private.SourceBuilt.Artifacts.*.${targetRid}

     

       58
       58
        
               pushd ${pname}.${version}.nupkg

     

       59
       59
        
       

     

       60
       60
        
               xmlstarlet \

     
···

       136
       136
        
             runHook preInstall

     

       137
       137
        
       

     

       138
       138
        
             mkdir -p "$out"/share

     

       139
       139
       -
             cp -r "$src"/dotnet-sdk-${version}-${targetRid} "$out"/share/dotnet

     

       139
       139
       +
             cp -r "$src"/lib/dotnet-sdk-${version}-${targetRid} "$out"/share/dotnet

     

       140
       140
        
             chmod +w "$out"/share/dotnet

     

       141
       141
        
             mkdir "$out"/bin

     

       142
       142
        
             ln -s "$out"/share/dotnet/dotnet "$out"/bin/dotnet

     

       143
       143
        
       

     

       144
       144
        
             mkdir -p "$artifacts"

     

       145
       145
       -
             cp -r "$src"/Private.SourceBuilt.Artifacts.*.${targetRid}/* "$artifacts"/

     

       145
       145
       +
             cp -r "$src"/lib/Private.SourceBuilt.Artifacts.*.${targetRid}/* "$artifacts"/

     

       146
       146
        
             chmod +w -R "$artifacts"

     

       147
       147
        
       

     

       148
       148
        
             local package

     
···

       193
       193
        
             runHook preInstall

     

       194
       194
        
       

     

       195
       195
        
             mkdir -p "$out"/share

     

       196
       196
       -
             cp -r "$src/dotnet-runtime-${version}-${targetRid}" "$out"/share/dotnet

     

       196
       196
       +
             cp -r "$src/lib/dotnet-runtime-${version}-${targetRid}" "$out"/share/dotnet

     

       197
       197
        
             chmod +w "$out"/share/dotnet

     

       198
       198
        
             mkdir "$out"/bin

     

       199
       199
        
             ln -s "$out"/share/dotnet/dotnet "$out"/bin/dotnet

     
···

       221
       221
        
             runHook preInstall

     

       222
       222
        
       

     

       223
       223
        
             mkdir -p "$out"/share

     

       224
       224
       -
             cp -r "$src/dotnet-runtime-${runtime.version}-${targetRid}" "$out"/share/dotnet

     

       224
       224
       +
             cp -r "$src/lib/dotnet-runtime-${runtime.version}-${targetRid}" "$out"/share/dotnet

     

       225
       225
        
             chmod +w "$out"/share/dotnet/shared

     

       226
       226
        
             mkdir "$out"/bin

     

       227
       227
        
             ln -s "$out"/share/dotnet/dotnet "$out"/bin/dotnet

     

       228
       228
        
       

     

       229
       229
       -
             cp -Tr "$src/aspnetcore-runtime-${version}-${targetRid}"/shared/Microsoft.AspNetCore.App "$out"/share/dotnet/shared/Microsoft.AspNetCore.App

     

       229
       229
       +
             cp -Tr "$src/lib/aspnetcore-runtime-${version}-${targetRid}"/shared/Microsoft.AspNetCore.App "$out"/share/dotnet/shared/Microsoft.AspNetCore.App

     

       230
       230
        
             chmod +w "$out"/share/dotnet/shared

     

       231
       231
        
       

     

       232
       232
        
             runHook postInstall

+9 -14

pkgs/development/compilers/dotnet/vmr.nix

···

       188
       188
        
           substituteInPlace \

     

       189
       189
        
             src/runtime/src/native/libs/CMakeLists.txt \

     

       190
       190
        
             --replace-fail 'add_compile_options(-Weverything)' 'add_compile_options(-Wall)'

     

       191
       191
       -
       

     

       192
       192
       -
           # strip native symbols in runtime

     

       193
       193
       -
           # see: https://github.com/dotnet/source-build/issues/2543

     

       194
       194
       -
           xmlstarlet ed \

     

       195
       195
       -
             --inplace \

     

       196
       196
       -
             -s //Project -t elem -n PropertyGroup \

     

       197
       197
       -
             -s \$prev -t elem -n KeepNativeSymbols -v false \

     

       198
       198
       -
             src/runtime/Directory.Build.props

     

       199
       191
        
         ''

     

       200
       192
        
         + lib.optionalString (lib.versionAtLeast version "9") (

     

       201
       193
        
           ''

     
···

       393
       385
        
         # bash: warning: setlocale: LC_ALL: cannot change locale (en_US.UTF-8)

     

       394
       386
        
         LOCALE_ARCHIVE = lib.optionalString isLinux "${glibcLocales}/lib/locale/locale-archive";

     

       395
       387
        
       

     

       388
       388
       +
         # clang: error: argument unused during compilation: '-Wa,--compress-debug-sections' [-Werror,-Wunused-command-line-argument]

     

       389
       389
       +
         # caused by separateDebugInfo

     

       390
       390
       +
         NIX_CFLAGS_COMPILE = "-Wno-unused-command-line-argument";

     

       391
       391
       +
       

     

       396
       392
        
         buildFlags = [

     

       397
       393
        
           "--with-packages"

     

       398
       394
        
           bootstrapSdk.artifacts

     
···

       447
       443
        
           ''

     

       448
       444
        
             runHook preInstall

     

       449
       445
        
       

     

       450
       450
       -
             mkdir "$out"

     

       446
       446
       +
             mkdir -p "$out"/lib

     

       451
       447
        
       

     

       452
       448
        
             pushd "artifacts/${assets}/Release"

     

       453
       449
        
             find . -name \*.tar.gz | while read archive; do

     

       454
       454
       -
               target=$out/$(basename "$archive" .tar.gz)

     

       450
       450
       +
               target=$out/lib/$(basename "$archive" .tar.gz)

     

       455
       451
        
               # dotnet 9 currently has two copies of the sdk tarball

     

       456
       452
        
               [[ ! -e "$target" ]] || continue

     

       457
       453
        
               mkdir "$target"

     
···

       460
       456
        
             popd

     

       461
       457
        
       

     

       462
       458
        
             local -r unpacked="$PWD/.unpacked"

     

       463
       463
       -
             for nupkg in $out/Private.SourceBuilt.Artifacts.*.${targetRid}/{,SourceBuildReferencePackages/}*.nupkg; do

     

       459
       459
       +
             for nupkg in $out/lib/Private.SourceBuilt.Artifacts.*.${targetRid}/{,SourceBuildReferencePackages/}*.nupkg; do

     

       464
       460
        
                 rm -rf "$unpacked"

     

       465
       461
        
                 unzip ${unzipFlags} "$unpacked" "$nupkg"

     

       466
       462
        
                 chmod -R +rw "$unpacked"

     
···

       479
       475
        
           echo ${sigtool} > "$out"/nix-support/manual-sdk-deps

     

       480
       476
        
         '';

     

       481
       477
        
       

     

       482
       482
       -
         # dotnet cli is in the root, so we need to strip from there

     

       483
       483
       -
         # TODO: should we install in $out/share/dotnet?

     

       484
       484
       -
         stripDebugList = [ "." ];

     

       485
       478
        
         # stripping dlls results in:

     

       486
       479
        
         # Failed to load System.Private.CoreLib.dll (error code 0x8007000B)

     

       487
       480
        
         # stripped crossgen2 results in:

     
···

       490
       483
        
         preFixup = ''

     

       491
       484
        
           stripExclude=(\*.dll crossgen2)

     

       492
       485
        
         '';

     

       486
       486
       +
       

     

       487
       487
       +
         separateDebugInfo = true;

     

       493
       488
        
       

     

       494
       489
        
         passthru = {

     

       495
       490
        
           inherit releaseManifest buildRid targetRid;