Unverified Commit d1d24198 authored by Philip Taron's avatar Philip Taron Committed by GitHub
Browse files

treewide: support structuredAttrs in setup hooks (part 3) (#340592)

parents 457fc3f1 202bfa48

pkgs/development/compilers/swift/swiftpm/setup-hook.sh

+7 −5
Original line number Diff line number Diff line 
# shellcheck shell=bash



# Build using 'swift-build'.

swiftpmBuildPhase() {

    runHook preBuild
@@ -8,10 +10,10 @@ swiftpmBuildPhase() { 
    fi



    local flagsArray=(

        -j $buildCores

        -j "$buildCores"

        -c "${swiftpmBuildConfig-release}"

        $swiftpmFlags "${swiftpmFlagsArray[@]}"

    )

    concatTo flagsArray swiftpmFlags swiftpmFlagsArray



    echoCmd 'build flags' "${flagsArray[@]}"

    TERM=dumb swift-build "${flagsArray[@]}"
@@ -33,10 +35,10 @@ swiftpmCheckPhase() { 
    fi



    local flagsArray=(

        -j $buildCores

        -j "$buildCores"

        -c "${swiftpmBuildConfig-release}"

        $swiftpmFlags "${swiftpmFlagsArray[@]}"

    )

    concatTo flagsArray swiftpmFlags swiftpmFlagsArray



    echoCmd 'check flags' "${flagsArray[@]}"

    TERM=dumb swift-test "${flagsArray[@]}"
@@ -53,8 +55,8 @@ fi 
swiftpmBinPath() {

    local flagsArray=(

        -c "${swiftpmBuildConfig-release}"

        $swiftpmFlags "${swiftpmFlagsArray[@]}"

    )

    concatTo flagsArray swiftpmFlags swiftpmFlagsArray



    swift-build --show-bin-path "${flagsArray[@]}"

}

pkgs/development/cuda-modules/setup-hooks/setup-cuda-hook.sh

+6 −5
Original line number Diff line number Diff line
@@ -54,7 +54,8 @@ setupCUDAToolkit_ROOT() { 
        fi

    done



    export cmakeFlags+=" -DCUDAToolkit_INCLUDE_DIR=$CUDAToolkit_INCLUDE_DIR -DCUDAToolkit_ROOT=$CUDAToolkit_ROOT"

    appendToVar cmakeFlags "-DCUDAToolkit_INCLUDE_DIR=$CUDAToolkit_INCLUDE_DIR"

    appendToVar cmakeFlags "-DCUDAToolkit_ROOT=$CUDAToolkit_ROOT"

}

preConfigureHooks+=(setupCUDAToolkit_ROOT)
@@ -72,8 +73,8 @@ setupCUDAToolkitCompilers() { 
    # https://cmake.org/cmake/help/latest/envvar/CUDAHOSTCXX.html

    # https://cmake.org/cmake/help/latest/variable/CMAKE_CUDA_HOST_COMPILER.html



    export cmakeFlags+=" -DCUDA_HOST_COMPILER=@ccFullPath@"

    export cmakeFlags+=" -DCMAKE_CUDA_HOST_COMPILER=@ccFullPath@"

    appendToVar cmakeFlags "-DCUDA_HOST_COMPILER=@ccFullPath@"

    appendToVar cmakeFlags "-DCMAKE_CUDA_HOST_COMPILER=@ccFullPath@"



    # For non-CMake projects:

    # We prepend --compiler-bindir to nvcc flags.
@@ -85,7 +86,7 @@ setupCUDAToolkitCompilers() { 
      export CUDAHOSTCXX="@ccFullPath@";

    fi



    export NVCC_PREPEND_FLAGS+=" --compiler-bindir=@ccRoot@/bin"

    appendToVar NVCC_PREPEND_FLAGS "--compiler-bindir=@ccRoot@/bin"



    # NOTE: We set -Xfatbin=-compress-all, which reduces the size of the compiled

    #   binaries. If binaries grow over 2GB, they will fail to link. This is a problem for us, as
@@ -94,7 +95,7 @@ setupCUDAToolkitCompilers() { 
    #

    # @SomeoneSerge: original comment was made by @ConnorBaker in .../cudatoolkit/common.nix

    if [[ -z "${dontCompressFatbin-}" ]]; then

        export NVCC_PREPEND_FLAGS+=" -Xfatbin=-compress-all"

        appendToVar NVCC_PREPEND_FLAGS "-Xfatbin=-compress-all"

    fi

}

preConfigureHooks+=(setupCUDAToolkitCompilers)

pkgs/development/libraries/kde-frameworks/extra-cmake-modules/setup-hook.sh

+39 −39
Original line number Diff line number Diff line
@@ -6,53 +6,53 @@ addEnvHooks "$targetOffset" ecmEnvHook 


ecmPostHook() {

    # Because we need to use absolute paths here, we must set *all* the paths.

    cmakeFlags+=" -DKDE_INSTALL_EXECROOTDIR=${!outputBin}"

    cmakeFlags+=" -DKDE_INSTALL_BINDIR=${!outputBin}/bin"

    cmakeFlags+=" -DKDE_INSTALL_SBINDIR=${!outputBin}/sbin"

    cmakeFlags+=" -DKDE_INSTALL_LIBDIR=${!outputLib}/lib"

    cmakeFlags+=" -DKDE_INSTALL_LIBEXECDIR=${!outputLib}/libexec"

    cmakeFlags+=" -DKDE_INSTALL_CMAKEPACKAGEDIR=${!outputDev}/lib/cmake"

    cmakeFlags+=" -DKDE_INSTALL_INCLUDEDIR=${!outputInclude}/include"

    cmakeFlags+=" -DKDE_INSTALL_LOCALSTATEDIR=/var"

    cmakeFlags+=" -DKDE_INSTALL_DATAROOTDIR=${!outputBin}/share"

    cmakeFlags+=" -DKDE_INSTALL_DATADIR=${!outputBin}/share"

    cmakeFlags+=" -DKDE_INSTALL_DOCBUNDLEDIR=${!outputBin}/share/doc/HTML"

    cmakeFlags+=" -DKDE_INSTALL_KCFGDIR=${!outputBin}/share/config.kcfg"

    cmakeFlags+=" -DKDE_INSTALL_KCONFUPDATEDIR=${!outputBin}/share/kconf_update"

    cmakeFlags+=" -DKDE_INSTALL_KSERVICES5DIR=${!outputBin}/share/kservices5"

    cmakeFlags+=" -DKDE_INSTALL_KSERVICETYPES5DIR=${!outputBin}/share/kservicetypes5"

    cmakeFlags+=" -DKDE_INSTALL_KXMLGUI5DIR=${!outputBin}/share/kxmlgui5"

    cmakeFlags+=" -DKDE_INSTALL_KNOTIFY5RCDIR=${!outputBin}/share/knotifications5"

    cmakeFlags+=" -DKDE_INSTALL_ICONDIR=${!outputBin}/share/icons"

    cmakeFlags+=" -DKDE_INSTALL_LOCALEDIR=${!outputLib}/share/locale"

    cmakeFlags+=" -DKDE_INSTALL_SOUNDDIR=${!outputBin}/share/sounds"

    cmakeFlags+=" -DKDE_INSTALL_TEMPLATEDIR=${!outputBin}/share/templates"

    cmakeFlags+=" -DKDE_INSTALL_WALLPAPERDIR=${!outputBin}/share/wallpapers"

    cmakeFlags+=" -DKDE_INSTALL_APPDIR=${!outputBin}/share/applications"

    cmakeFlags+=" -DKDE_INSTALL_DESKTOPDIR=${!outputBin}/share/desktop-directories"

    cmakeFlags+=" -DKDE_INSTALL_MIMEDIR=${!outputBin}/share/mime/packages"

    cmakeFlags+=" -DKDE_INSTALL_METAINFODIR=${!outputBin}/share/appdata"

    cmakeFlags+=" -DKDE_INSTALL_MANDIR=${!outputBin}/share/man"

    cmakeFlags+=" -DKDE_INSTALL_INFODIR=${!outputBin}/share/info"

    cmakeFlags+=" -DKDE_INSTALL_DBUSDIR=${!outputBin}/share/dbus-1"

    cmakeFlags+=" -DKDE_INSTALL_DBUSINTERFACEDIR=${!outputBin}/share/dbus-1/interfaces"

    cmakeFlags+=" -DKDE_INSTALL_DBUSSERVICEDIR=${!outputBin}/share/dbus-1/services"

    cmakeFlags+=" -DKDE_INSTALL_DBUSSYSTEMSERVICEDIR=${!outputBin}/share/dbus-1/system-services"

    cmakeFlags+=" -DKDE_INSTALL_SYSCONFDIR=${!outputBin}/etc"

    cmakeFlags+=" -DKDE_INSTALL_CONFDIR=${!outputBin}/etc/xdg"

    cmakeFlags+=" -DKDE_INSTALL_AUTOSTARTDIR=${!outputBin}/etc/xdg/autostart"

    appendToVar cmakeFlags "-DKDE_INSTALL_EXECROOTDIR=${!outputBin}"

    appendToVar cmakeFlags "-DKDE_INSTALL_BINDIR=${!outputBin}/bin"

    appendToVar cmakeFlags "-DKDE_INSTALL_SBINDIR=${!outputBin}/sbin"

    appendToVar cmakeFlags "-DKDE_INSTALL_LIBDIR=${!outputLib}/lib"

    appendToVar cmakeFlags "-DKDE_INSTALL_LIBEXECDIR=${!outputLib}/libexec"

    appendToVar cmakeFlags "-DKDE_INSTALL_CMAKEPACKAGEDIR=${!outputDev}/lib/cmake"

    appendToVar cmakeFlags "-DKDE_INSTALL_INCLUDEDIR=${!outputInclude}/include"

    appendToVar cmakeFlags "-DKDE_INSTALL_LOCALSTATEDIR=/var"

    appendToVar cmakeFlags "-DKDE_INSTALL_DATAROOTDIR=${!outputBin}/share"

    appendToVar cmakeFlags "-DKDE_INSTALL_DATADIR=${!outputBin}/share"

    appendToVar cmakeFlags "-DKDE_INSTALL_DOCBUNDLEDIR=${!outputBin}/share/doc/HTML"

    appendToVar cmakeFlags "-DKDE_INSTALL_KCFGDIR=${!outputBin}/share/config.kcfg"

    appendToVar cmakeFlags "-DKDE_INSTALL_KCONFUPDATEDIR=${!outputBin}/share/kconf_update"

    appendToVar cmakeFlags "-DKDE_INSTALL_KSERVICES5DIR=${!outputBin}/share/kservices5"

    appendToVar cmakeFlags "-DKDE_INSTALL_KSERVICETYPES5DIR=${!outputBin}/share/kservicetypes5"

    appendToVar cmakeFlags "-DKDE_INSTALL_KXMLGUI5DIR=${!outputBin}/share/kxmlgui5"

    appendToVar cmakeFlags "-DKDE_INSTALL_KNOTIFY5RCDIR=${!outputBin}/share/knotifications5"

    appendToVar cmakeFlags "-DKDE_INSTALL_ICONDIR=${!outputBin}/share/icons"

    appendToVar cmakeFlags "-DKDE_INSTALL_LOCALEDIR=${!outputLib}/share/locale"

    appendToVar cmakeFlags "-DKDE_INSTALL_SOUNDDIR=${!outputBin}/share/sounds"

    appendToVar cmakeFlags "-DKDE_INSTALL_TEMPLATEDIR=${!outputBin}/share/templates"

    appendToVar cmakeFlags "-DKDE_INSTALL_WALLPAPERDIR=${!outputBin}/share/wallpapers"

    appendToVar cmakeFlags "-DKDE_INSTALL_APPDIR=${!outputBin}/share/applications"

    appendToVar cmakeFlags "-DKDE_INSTALL_DESKTOPDIR=${!outputBin}/share/desktop-directories"

    appendToVar cmakeFlags "-DKDE_INSTALL_MIMEDIR=${!outputBin}/share/mime/packages"

    appendToVar cmakeFlags "-DKDE_INSTALL_METAINFODIR=${!outputBin}/share/appdata"

    appendToVar cmakeFlags "-DKDE_INSTALL_MANDIR=${!outputBin}/share/man"

    appendToVar cmakeFlags "-DKDE_INSTALL_INFODIR=${!outputBin}/share/info"

    appendToVar cmakeFlags "-DKDE_INSTALL_DBUSDIR=${!outputBin}/share/dbus-1"

    appendToVar cmakeFlags "-DKDE_INSTALL_DBUSINTERFACEDIR=${!outputBin}/share/dbus-1/interfaces"

    appendToVar cmakeFlags "-DKDE_INSTALL_DBUSSERVICEDIR=${!outputBin}/share/dbus-1/services"

    appendToVar cmakeFlags "-DKDE_INSTALL_DBUSSYSTEMSERVICEDIR=${!outputBin}/share/dbus-1/system-services"

    appendToVar cmakeFlags "-DKDE_INSTALL_SYSCONFDIR=${!outputBin}/etc"

    appendToVar cmakeFlags "-DKDE_INSTALL_CONFDIR=${!outputBin}/etc/xdg"

    appendToVar cmakeFlags "-DKDE_INSTALL_AUTOSTARTDIR=${!outputBin}/etc/xdg/autostart"



    if [ "$(uname)" = "Darwin" ]; then

        cmakeFlags+=" -DKDE_INSTALL_BUNDLEDIR=${!outputBin}/Applications/KDE"

        appendToVar cmakeFlags "-DKDE_INSTALL_BUNDLEDIR=${!outputBin}/Applications/KDE"

    fi



    if [ -n "${qtPluginPrefix-}" ]; then

        cmakeFlags+=" -DKDE_INSTALL_QTPLUGINDIR=${!outputBin}/$qtPluginPrefix"

        cmakeFlags+=" -DKDE_INSTALL_PLUGINDIR=${!outputBin}/$qtPluginPrefix"

        appendToVar cmakeFlags "-DKDE_INSTALL_QTPLUGINDIR=${!outputBin}/$qtPluginPrefix"

        appendToVar cmakeFlags "-DKDE_INSTALL_PLUGINDIR=${!outputBin}/$qtPluginPrefix"

    fi



    if [ -n "${qtQmlPrefix-}" ]; then

        cmakeFlags+=" -DKDE_INSTALL_QMLDIR=${!outputBin}/$qtQmlPrefix"

        appendToVar cmakeFlags "-DKDE_INSTALL_QMLDIR=${!outputBin}/$qtQmlPrefix"

    fi

}

postHooks+=(ecmPostHook)

pkgs/development/tools/build-managers/gradle/setup-hook.sh

+3 −1
Original line number Diff line number Diff line
@@ -29,7 +29,9 @@ gradleConfigureHook() { 
}



gradle() {

    command gradle $gradleFlags "${gradleFlagsArray[@]}" "$@"

    local flagsArray=()

    concatTo flagsArray gradleFlags gradleFlagsArray

    command gradle "${flagsArray[@]}" "$@"

}



gradleBuildPhase() {

pkgs/development/tools/xcbuild/setup-hook.sh

+5 −2
Original line number Diff line number Diff line
@@ -3,9 +3,12 @@ xcbuildBuildPhase() { 


    runHook preBuild



    echo "running xcodebuild"

    local flagsArray=()

    concatTo flagsArray xcbuildFlags



    xcodebuild SYMROOT=$PWD/Products OBJROOT=$PWD/Intermediates $xcbuildFlags build

    echoCmd 'running xcodebuild' "${flagsArray[@]}"



    xcodebuild SYMROOT=$PWD/Products OBJROOT=$PWD/Intermediates "${flagsArray[@]}" build



    runHook postBuild

}