commit a7c598e458183b30a7218f3b1301a689b39a6542 · pyrox.dev/nixpkgs

+6 -6

pkgs/build-support/dotnet/build-dotnet-module/hooks/dotnet-build-hook.sh

···

       7
       7
        
           runHook preBuild

     

       8
       8
        
       

     

       9
       9
        
           if [ "${enableParallelBuilding-}" ]; then

     

       10
       10
       -
               maxCpuFlag="$NIX_BUILD_CORES"

     

       11
       11
       -
               parallelBuildFlag="true"

     

       10
       10
       +
               local -r maxCpuFlag="$NIX_BUILD_CORES"

     

       11
       11
       +
               local -r parallelBuildFlag="true"

     

       12
       12
        
           else

     

       13
       13
       -
               maxCpuFlag="1"

     

       14
       14
       -
               parallelBuildFlag="false"

     

       13
       13
       +
               local -r maxCpuFlag="1"

     

       14
       14
       +
               local -r parallelBuildFlag="false"

     

       15
       15
        
           fi

     

       16
       16
        
       

     

       17
       17
        
           if [ "${selfContainedBuild-}" ]; then

     
···

       21
       21
        
           fi

     

       22
       22
        
       

     

       23
       23
        
           if [ "${version-}" ]; then

     

       24
       24
       -
               versionFlag="-p:Version=${version-}"

     

       24
       24
       +
               local -r versionFlag="-p:Version=${version-}"

     

       25
       25
        
           fi

     

       26
       26
        
       

     

       27
       27
       -
           for project in ${projectFile[@]} ${testProjectFile[@]}; do

     

       27
       27
       +
           for project in ${projectFile[@]} ${testProjectFile[@]-}; do

     

       28
       28
        
               env \

     

       29
       29
        
                   dotnet build "$project" \

     

       30
       30
        
                       -maxcpucount:$maxCpuFlag \

+8 -2

pkgs/build-support/dotnet/build-dotnet-module/hooks/dotnet-check-hook.sh

···

       7
       7
        
           runHook preCheck

     

       8
       8
        
       

     

       9
       9
        
           if [ "${disabledTests-}" ]; then

     

       10
       10
       -
               disabledTestsFlag="--filter FullyQualifiedName!=@disabledTests@"

     

       10
       10
       +
               local -r disabledTestsFlag="--filter FullyQualifiedName!=@disabledTests@"

     

       11
       11
        
           fi

     

       12
       12
        
       

     

       13
       13
       -
           for project in ${testProjectFile[@]}; do

     

       13
       13
       +
           if [ "${enableParallelBuilding-}" ]; then

     

       14
       14
       +
               local -r maxCpuFlag="$NIX_BUILD_CORES"

     

       15
       15
       +
           else

     

       16
       16
       +
               local -r maxCpuFlag="1"

     

       17
       17
       +
           fi

     

       18
       18
       +
       

     

       19
       19
       +
           for project in ${testProjectFile[@]-}; do

     

       14
       20
        
               env "LD_LIBRARY_PATH=@libraryPath@" \

     

       15
       21
        
                   dotnet test "$project" \

     

       16
       22
        
                     -maxcpucount:$maxCpuFlag \

+2 -2

pkgs/build-support/dotnet/build-dotnet-module/hooks/dotnet-configure-hook.sh

···

       10
       10
        
           runHook preConfigure

     

       11
       11
        
       

     

       12
       12
        
           if [ -z "${enableParallelBuilding-}" ]; then

     

       13
       13
       -
               parallelFlag="--disable-parallel"

     

       13
       13
       +
               local -r parallelFlag="--disable-parallel"

     

       14
       14
        
           fi

     

       15
       15
        
       

     

       16
       16
       -
           for project in ${projectFile[@]} ${testProjectFile[@]}; do

     

       16
       16
       +
           for project in ${projectFile[@]} ${testProjectFile[@]-}; do

     

       17
       17
        
               env \

     

       18
       18
        
                   dotnet restore "$project" \

     

       19
       19
        
                       -p:ContinuousIntegrationBuild=true \

+12 -13

pkgs/build-support/dotnet/build-dotnet-module/hooks/dotnet-fixup-hook.sh

···

       5
       5
        
       # the second is the destination for the wrapper.

     

       6
       6
        
       wrapDotnetProgram() {

     

       7
       7
        
           if [ ! "${selfContainedBuild-}" ]; then

     

       8
       8
       -
               dotnetRootFlag=("--set" "DOTNET_ROOT" "@dotnetRuntime@")

     

       8
       8
       +
               local -r dotnetRootFlag=("--set" "DOTNET_ROOT" "@dotnetRuntime@")

     

       9
       9
        
           fi

     

       10
       10
        
       

     

       11
       11
        
           makeWrapper "$1" "$2" \

     

       12
       12
       -
               "${dotnetRootFlag[@]}" \

     

       13
       12
        
               --suffix "LD_LIBRARY_PATH" : "@runtimeDeps@" \

     

       13
       13
       +
               "${dotnetRootFlag[@]}" \

     

       14
       14
        
               "${gappsWrapperArgs[@]}" \

     

       15
       15
        
               "${makeWrapperArgs[@]}"

     

       16
       16
        
       

     

       17
       17
       -
           echo "Installed wrapper to: "$2""

     

       17
       17
       +
           echo "installed wrapper to "$2""

     

       18
       18
        
       }

     

       19
       19
        
       

     

       20
       20
        
       dotnetFixupHook() {

     

       21
       21
        
           echo "Executing dotnetFixupPhase"

     

       22
       22
        
       

     

       23
       23
       -
           if [ "${executables}" ]; then

     

       23
       23
       +
           if [ "${executables-}" ]; then

     

       24
       24
        
               for executable in ${executables[@]}; do

     

       25
       25
       -
                   execPath="$out/lib/${pname}/$executable"

     

       25
       25
       +
                   path="$out/lib/$pname/$executable"

     

       26
       26
        
       

     

       27
       27
       -
                   if [[ -f "$execPath" && -x "$execPath" ]]; then

     

       28
       28
       -
                       wrapDotnetProgram "$execPath" "$out/bin/$(basename "$executable")"

     

       27
       27
       +
                   if test -x "$path"; then

     

       28
       28
       +
                       wrapDotnetProgram "$path" "$out/bin/$(basename "$executable")"

     

       29
       29
        
                   else

     

       30
       30
       -
                       echo "Specified binary \"$executable\" is either not an executable, or does not exist!"

     

       30
       30
       +
                       echo "Specified binary \"$executable\" is either not an executable or does not exist!"

     

       31
       31
       +
                       echo "Looked in $path"

     

       31
       32
        
                       exit 1

     

       32
       33
        
                   fi

     

       33
       34
        
               done

     

       34
       35
        
           else

     

       35
       35
       -
               for executable in $out/lib/${pname}/*; do

     

       36
       36
       -
                   if [[ -f "$executable" && -x "$executable" && "$executable" != *"dll"* ]]; then

     

       37
       37
       -
                       wrapDotnetProgram "$executable" "$out/bin/$(basename "$executable")"

     

       38
       38
       -
                   fi

     

       39
       39
       -
               done

     

       36
       36
       +
               while IFS= read -d '' executable; do

     

       37
       37
       +
                   wrapDotnetProgram "$executable" "$out/bin/$(basename "$executable")" \;

     

       38
       38
       +
               done < <(find "$out/lib/$pname" ! -name "*.dll" -executable -type f -print0)

     

       40
       39
        
           fi

     

       41
       40
        
       

     

       42
       41
        
           echo "Finished dotnetFixupPhase"