Commit 4bf5bf18 authored by David McFarland's avatar David McFarland
Browse files

dotnet: fix RPATH in ilcompiler output

parent 0217d3ba

pkgs/development/compilers/dotnet/build-dotnet.nix

+21 −5
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ assert if type == "sdk" then packages != null else true; 
, libuuid

, zlib

, libkrb5

, openssl

, curl

, lttng-ust_2_12

, testers
@@ -51,6 +52,20 @@ let 
  sigtool = callPackage ./sigtool.nix {};

  signAppHost = callPackage ./sign-apphost.nix {};



  hasILCompiler = lib.versionAtLeast version "7";



  extraTargets = writeText "extra.targets" (''

    <Project>

  '' + lib.optionalString hasILCompiler ''

      <ItemGroup>

        <CustomLinkerArg Include="-Wl,-rpath,'${lib.makeLibraryPath [ icu zlib openssl ]}'" />

      </ItemGroup>

  '' + lib.optionalString stdenv.isDarwin ''

      <Import Project="${signAppHost}" />

  '' + ''

    </Project>

  '');



in

mkCommon type rec {

  inherit pname version;
@@ -70,6 +85,7 @@ mkCommon type rec { 
    icu

    libkrb5

    curl

    xmlstarlet

  ] ++ lib.optional stdenv.isLinux lttng-ust_2_12;



  src = fetchurl (
@@ -79,15 +95,15 @@ mkCommon type rec { 


  sourceRoot = ".";



  postPatch = if type == "sdk" && stdenv.isDarwin then ''

  postPatch = if type == "sdk" then (''

    xmlstarlet ed \

      --inplace \

      -s //_:Project -t elem -n Import \

      -i \$prev -t attr -n Project -v "${signAppHost}" \

      -i \$prev -t attr -n Project -v "${extraTargets}" \

      sdk/*/Sdks/Microsoft.NET.Sdk/targets/Microsoft.NET.Sdk.targets



  '' + lib.optionalString stdenv.isDarwin ''

    codesign --remove-signature packs/Microsoft.NETCore.App.Host.osx-*/*/runtimes/osx-*/native/{apphost,singlefilehost}

  '' else null;

  '') else null;



  dontPatchELF = true;

  noDumpEnvVars = true;
@@ -135,7 +151,7 @@ mkCommon type rec { 
  '';



  passthru = {

    inherit icu;

    inherit icu hasILCompiler;

  } // lib.optionalAttrs (type == "sdk") {

    packages = mkNugetDeps {

      name = "${pname}-${version}-deps";

pkgs/development/compilers/dotnet/packages.nix

+2 −0
Original line number Diff line number Diff line
@@ -37,6 +37,8 @@ in { 


    passthru = {

      inherit (vmr) icu targetRid;

      # ilcompiler is currently broken: https://github.com/dotnet/source-build/issues/1215

      hasILCompiler = false;

    };



    meta = vmr.meta // {