Unverified Commit 1bcca7d6 authored by Wolfgang Walther's avatar Wolfgang Walther
Browse files

qt: support structuredAttrs in qmake hook 

Tested qbs with and without __structuredAttrs.
parent 5b370227

pkgs/development/libraries/qt-5/hooks/qmake-hook.sh

+16 −20
Original line number Diff line number Diff line 
. @fix_qmake_libtool@



qmakeFlags=( ${qmakeFlags-} )



qmakePrePhase() {

    qmakeFlags_orig=( "${qmakeFlags[@]}" )



    # These flags must be added _before_ the flags specified in the derivation.

    qmakeFlags=( \

    prependToVar qmakeFlags \

      "PREFIX=$out" \

      "NIX_OUTPUT_OUT=$out" \

      "NIX_OUTPUT_DEV=${!outputDev}" \

      "NIX_OUTPUT_BIN=${!outputBin}" \

      "NIX_OUTPUT_DOC=${!outputDev}/${qtDocPrefix:?}" \

      "NIX_OUTPUT_QML=${!outputBin}/${qtQmlPrefix:?}" \

        "NIX_OUTPUT_PLUGIN=${!outputBin}/${qtPluginPrefix:?}" \

    )

      "NIX_OUTPUT_PLUGIN=${!outputBin}/${qtPluginPrefix:?}"



    if [ -n "@debug@" ]; then

        qmakeFlags+=( "CONFIG+=debug" )

        prependToVar qmakeFlags "CONFIG+=debug"

    else

        qmakeFlags+=( "CONFIG+=release" )

        prependToVar qmakeFlags "CONFIG+=release"

    fi



    # do the stripping ourselves (needed for separateDebugInfo)

    qmakeFlags+=( "CONFIG+=nostrip" )



    qmakeFlags+=( "${qmakeFlags_orig[@]}" )

    prependToVar qmakeFlags "CONFIG+=nostrip"

}

prePhases+=" qmakePrePhase"



qmakeConfigurePhase() {

    runHook preConfigure



    local flagsArray=()

    concatTo flagsArray qmakeFlags



    echo "QMAKEPATH=$QMAKEPATH"

    echo qmake "${qmakeFlags[@]}"

    qmake "${qmakeFlags[@]}"

    echo qmake "${flagsArray[@]}"

    qmake "${flagsArray[@]}"



    if ! [[ -v enableParallelBuilding ]]; then

        enableParallelBuilding=1

pkgs/development/libraries/qt-5/hooks/qttools-setup-hook.sh

+1 −1
Original line number Diff line number Diff line 
qmakeFlags+=( "QMAKE_LRELEASE=@dev@/bin/lrelease" )
 
appendToVar qmakeFlags "QMAKE_LRELEASE=@dev@/bin/lrelease"

pkgs/development/libraries/qt-6/hooks/qmake-hook.sh

+12 −16
Original line number Diff line number Diff line 
. @fix_qmake_libtool@



qmakeFlags=(${qmakeFlags-})



qmakePrePhase() {

    qmakeFlags_orig=("${qmakeFlags[@]}")



    # These flags must be added _before_ the flags specified in the derivation.

    # TODO: these flags also need a patch which isn't applied

    # can we either remove these flags or update the qt5 patch?

    # "NIX_OUTPUT_DOC=${!outputDev}/${qtDocPrefix:?}" \

    qmakeFlags=(

        "PREFIX=$out"

        "NIX_OUTPUT_OUT=$out"

        "NIX_OUTPUT_DEV=${!outputDev}"

        "NIX_OUTPUT_BIN=${!outputBin}"

        "NIX_OUTPUT_QML=${!outputBin}/${qtQmlPrefix:?}"

    prependToVar qmakeFlags \

      "PREFIX=$out" \

      "NIX_OUTPUT_OUT=$out" \

      "NIX_OUTPUT_DEV=${!outputDev}" \

      "NIX_OUTPUT_BIN=${!outputBin}" \

      "NIX_OUTPUT_QML=${!outputBin}/${qtQmlPrefix:?}" \

      "NIX_OUTPUT_PLUGIN=${!outputBin}/${qtPluginPrefix:?}"

    )



    qmakeFlags+=("${qmakeFlags_orig[@]}")

}

prePhases+=" qmakePrePhase"



qmakeConfigurePhase() {

    runHook preConfigure



    local flagsArray=()

    concatTo flagsArray qmakeFlags



    echo "QMAKEPATH=$QMAKEPATH"

    echo qmake "${qmakeFlags[@]}"

    qmake "${qmakeFlags[@]}"

    echo qmake "${flagsArray[@]}"

    qmake "${flagsArray[@]}"



    if ! [[ -v enableParallelBuilding ]]; then

        enableParallelBuilding=1