commit d25348517e1e98cc1023b3b233f488c519c1cd77 · pyrox.dev/nixpkgs

+24 -27

pkgs/development/libraries/qt-6/hooks/fix-qt-builtin-paths.sh

···

       7
       7
        
       fixQtBuiltinPaths() {

     

       8
       8
        
           local dir="$1"

     

       9
       9
        
           local pattern="$2"

     

       10
       10
       -
           local bin="${!outputBin}"

     

       11
       11
       -
           local dev="${!outputDev}"

     

       12
       12
       -
           local doc="${!outputDoc}"

     

       13
       10
        
           local lib="${!outputLib}"

     

       14
       11
        
       

     

       15
       12
        
           if [ -d "$dir" ]; then

     
···

       17
       14
        
                   if grep -q '\$\$\[QT_' "${pr_:?}"; then

     

       18
       15
        
                       echo "fixQtBuiltinPaths: Fixing Qt builtin paths in \`${pr_:?}'..."

     

       19
       16
        
                       sed -i "${pr_:?}" \

     

       20
       20
       -
                           -e "s|\\\$\\\$\\[QT_HOST_BINS[^]]*\\]|$dev/bin|g" \

     

       21
       21
       -
                           -e "s|\\\$\\\$\\[QT_HOST_LIBEXECS[^]]*\\]|$dev/libexec|g" \

     

       22
       22
       -
                           -e "s|\\\$\\\$\\[QT_HOST_DATA[^]]*\\]/mkspecs|$dev/mkspecs|g" \

     

       23
       23
       -
                           -e "s|\\\$\\\$\\[QT_HOST_PREFIX[^]]*\\]|$dev|g" \

     

       17
       17
       +
                           -e "s|\\\$\\\$\\[QT_HOST_BINS[^]]*\\]|$lib/bin|g" \

     

       18
       18
       +
                           -e "s|\\\$\\\$\\[QT_HOST_LIBEXECS[^]]*\\]|$lib/libexec|g" \

     

       19
       19
       +
                           -e "s|\\\$\\\$\\[QT_HOST_DATA[^]]*\\]/mkspecs|$lib/mkspecs|g" \

     

       20
       20
       +
                           -e "s|\\\$\\\$\\[QT_HOST_PREFIX[^]]*\\]|$lib|g" \

     

       24
       21
        
                           -e "s|\\\$\\\$\\[QT_INSTALL_ARCHDATA[^]]*\\]|$lib|g" \

     

       25
       25
       -
                           -e "s|\\\$\\\$\\[QT_INSTALL_BINS[^]]*\\]|$bin/bin|g" \

     

       26
       26
       -
                           -e "s|\\\$\\\$\\[QT_INSTALL_CONFIGURATION[^]]*\\]|$bin|g" \

     

       22
       22
       +
                           -e "s|\\\$\\\$\\[QT_INSTALL_BINS[^]]*\\]|$lib/bin|g" \

     

       23
       23
       +
                           -e "s|\\\$\\\$\\[QT_INSTALL_CONFIGURATION[^]]*\\]|$lib|g" \

     

       27
       24
        
                           -e "s|\\\$\\\$\\[QT_INSTALL_DATA[^]]*\\]|$lib|g" \

     

       28
       28
       -
                           -e "s|\\\$\\\$\\[QT_INSTALL_DOCS[^]]*\\]|$doc/share/doc|g" \

     

       29
       29
       -
                           -e "s|\\\$\\\$\\[QT_INSTALL_EXAMPLES[^]]*\\]|$doc/examples|g" \

     

       30
       30
       -
                           -e "s|\\\$\\\$\\[QT_INSTALL_HEADERS[^]]*\\]|$dev/include|g" \

     

       25
       25
       +
                           -e "s|\\\$\\\$\\[QT_INSTALL_DOCS[^]]*\\]|$lib/share/doc|g" \

     

       26
       26
       +
                           -e "s|\\\$\\\$\\[QT_INSTALL_EXAMPLES[^]]*\\]|$lib/examples|g" \

     

       27
       27
       +
                           -e "s|\\\$\\\$\\[QT_INSTALL_HEADERS[^]]*\\]|$lib/include|g" \

     

       31
       28
        
                           -e "s|\\\$\\\$\\[QT_INSTALL_LIBS[^]]*\\]|$lib/lib|g" \

     

       32
       29
        
                           -e "s|\\\$\\\$\\[QT_INSTALL_LIBEXECS[^]]*\\]|$lib/libexec|g" \

     

       33
       33
       -
                           -e "s|\\\$\\\$\\[QT_INSTALL_PLUGINS[^]]*\\]|$bin/$qtPluginPrefix|g" \

     

       30
       30
       +
                           -e "s|\\\$\\\$\\[QT_INSTALL_PLUGINS[^]]*\\]|$lib/$qtPluginPrefix|g" \

     

       34
       31
        
                           -e "s|\\\$\\\$\\[QT_INSTALL_PREFIX[^]]*\\]|$lib|g" \

     

       35
       35
       -
                           -e "s|\\\$\\\$\\[QT_INSTALL_TESTS[^]]*\\]|$dev/tests|g" \

     

       32
       32
       +
                           -e "s|\\\$\\\$\\[QT_INSTALL_TESTS[^]]*\\]|$lib/tests|g" \

     

       36
       33
        
                           -e "s|\\\$\\\$\\[QT_INSTALL_TRANSLATIONS[^]]*\\]|$lib/translations|g" \

     

       37
       37
       -
                           -e "s|\\\$\\\$\\[QT_INSTALL_QML[^]]*\\]|$bin/$qtQmlPrefix|g"

     

       34
       34
       +
                           -e "s|\\\$\\\$\\[QT_INSTALL_QML[^]]*\\]|$lib/$qtQmlPrefix|g"

     

       38
       35
        
                   fi

     

       39
       36
        
               done

     

       40
       37
        
           elif [ -e "$dir" ]; then

     

       41
       38
        
               if grep -q '\$\$\[QT_' "${dir:?}"; then

     

       42
       39
        
                   echo "fixQtBuiltinPaths: Fixing Qt builtin paths in \`${dir:?}'..."

     

       43
       40
        
                   sed -i "${dir:?}" \

     

       44
       44
       -
                       -e "s|\\\$\\\$\\[QT_HOST_BINS[^]]*\\]|$dev/bin|g" \

     

       45
       45
       -
                       -e "s|\\\$\\\$\\[QT_HOST_LIBEXECS[^]]*\\]|$dev/libexec|g" \

     

       46
       46
       -
                       -e "s|\\\$\\\$\\[QT_HOST_DATA[^]]*\\]/mkspecs|$dev/mkspecs|g" \

     

       47
       47
       -
                       -e "s|\\\$\\\$\\[QT_HOST_PREFIX[^]]*\\]|$dev|g" \

     

       41
       41
       +
                       -e "s|\\\$\\\$\\[QT_HOST_BINS[^]]*\\]|$lib/bin|g" \

     

       42
       42
       +
                       -e "s|\\\$\\\$\\[QT_HOST_LIBEXECS[^]]*\\]|$lib/libexec|g" \

     

       43
       43
       +
                       -e "s|\\\$\\\$\\[QT_HOST_DATA[^]]*\\]/mkspecs|$lib/mkspecs|g" \

     

       44
       44
       +
                       -e "s|\\\$\\\$\\[QT_HOST_PREFIX[^]]*\\]|$lib|g" \

     

       48
       45
        
                       -e "s|\\\$\\\$\\[QT_INSTALL_ARCHDATA[^]]*\\]|$lib|g" \

     

       49
       49
       -
                       -e "s|\\\$\\\$\\[QT_INSTALL_BINS[^]]*\\]|$bin/bin|g" \

     

       50
       50
       -
                       -e "s|\\\$\\\$\\[QT_INSTALL_CONFIGURATION[^]]*\\]|$bin|g" \

     

       46
       46
       +
                       -e "s|\\\$\\\$\\[QT_INSTALL_BINS[^]]*\\]|$lib/bin|g" \

     

       47
       47
       +
                       -e "s|\\\$\\\$\\[QT_INSTALL_CONFIGURATION[^]]*\\]|$lib|g" \

     

       51
       48
        
                       -e "s|\\\$\\\$\\[QT_INSTALL_DATA[^]]*\\]|$lib|g" \

     

       52
       52
       -
                       -e "s|\\\$\\\$\\[QT_INSTALL_DOCS[^]]*\\]|$doc/share/doc|g" \

     

       53
       53
       -
                       -e "s|\\\$\\\$\\[QT_INSTALL_EXAMPLES[^]]*\\]|$doc/examples|g" \

     

       54
       54
       -
                       -e "s|\\\$\\\$\\[QT_INSTALL_HEADERS[^]]*\\]|$dev/include|g" \

     

       49
       49
       +
                       -e "s|\\\$\\\$\\[QT_INSTALL_DOCS[^]]*\\]|$lib/share/doc|g" \

     

       50
       50
       +
                       -e "s|\\\$\\\$\\[QT_INSTALL_EXAMPLES[^]]*\\]|$lib/examples|g" \

     

       51
       51
       +
                       -e "s|\\\$\\\$\\[QT_INSTALL_HEADERS[^]]*\\]|$lib/include|g" \

     

       55
       52
        
                       -e "s|\\\$\\\$\\[QT_INSTALL_LIBS[^]]*\\]|$lib/lib|g" \

     

       56
       53
        
                       -e "s|\\\$\\\$\\[QT_INSTALL_LIBEXECS[^]]*\\]|$lib/libexec|g" \

     

       57
       57
       -
                       -e "s|\\\$\\\$\\[QT_INSTALL_PLUGINS[^]]*\\]|$bin/$qtPluginPrefix|g" \

     

       54
       54
       +
                       -e "s|\\\$\\\$\\[QT_INSTALL_PLUGINS[^]]*\\]|$lib/$qtPluginPrefix|g" \

     

       58
       55
        
                       -e "s|\\\$\\\$\\[QT_INSTALL_PREFIX[^]]*\\]|$lib|g" \

     

       59
       59
       -
                       -e "s|\\\$\\\$\\[QT_INSTALL_TESTS[^]]*\\]|$dev/tests|g" \

     

       56
       56
       +
                       -e "s|\\\$\\\$\\[QT_INSTALL_TESTS[^]]*\\]|$lib/tests|g" \

     

       60
       57
        
                       -e "s|\\\$\\\$\\[QT_INSTALL_TRANSLATIONS[^]]*\\]|$lib/translations|g" \

     

       61
       61
       -
                       -e "s|\\\$\\\$\\[QT_INSTALL_QML[^]]*\\]|$bin/$qtQmlPrefix|g"

     

       58
       58
       +
                       -e "s|\\\$\\\$\\[QT_INSTALL_QML[^]]*\\]|$lib/$qtQmlPrefix|g"

     

       62
       59
        
               fi

     

       63
       60
        
           else

     

       64
       61
        
               echo "fixQtBuiltinPaths: Warning: \`$dir' does not exist"

+2 -11

pkgs/development/libraries/qt-6/hooks/fix-qt-module-paths.sh

···

       6
       6
        
       #

     

       7
       7
        
       fixQtModulePaths() {

     

       8
       8
        
           local dir="$1"

     

       9
       9
       -
           local bin="${!outputBin}"

     

       10
       10
       -
           local dev="${!outputDev}"

     

       11
       9
        
           local lib="${!outputLib}"

     

       12
       10
        
       

     

       13
       11
        
           if [ -d "$dir" ]; then

     
···

       17
       15
        
                       sed -i "${pr:?}" \

     

       18
       16
        
                           -e "s|\\\$\\\$QT_MODULE_LIB_BASE|$lib/lib|g" \

     

       19
       17
        
                           -e "s|\\\$\\\$QT_MODULE_HOST_LIB_BASE|$lib/lib|g" \

     

       20
       20
       -
                           -e "s|\\\$\\\$QT_MODULE_INCLUDE_BASE|$dev/include|g" \

     

       21
       21
       -
                           -e "s|\\\$\\\$QT_MODULE_BIN_BASE|$dev/bin|g"

     

       18
       18
       +
                           -e "s|\\\$\\\$QT_MODULE_INCLUDE_BASE|$lib/include|g" \

     

       19
       19
       +
                           -e "s|\\\$\\\$QT_MODULE_BIN_BASE|$lib/bin|g"

     

       22
       20
        
                   fi

     

       23
       21
        
               done

     

       24
       22
        
           elif [ -e "$dir" ]; then

     

       25
       23
        
               echo "fixQtModulePaths: Warning: \`$dir' is not a directory"

     

       26
       24
        
           else

     

       27
       25
        
               echo "fixQtModulePaths: Warning: \`$dir' does not exist"

     

       28
       28
       -
           fi

     

       29
       29
       -
       

     

       30
       30
       -
           if [ "z$bin" != "z$dev" ]; then

     

       31
       31
       -
               if [ -d "$bin/bin" ]; then

     

       32
       32
       -
                   mkdir -p "$dev/bin"

     

       33
       33
       -
                   lndir -silent "$bin/bin" "$dev/bin"

     

       34
       34
       -
               fi

     

       35
       26
        
           fi

     

       36
       27
        
       }

+6 -13

pkgs/development/libraries/qt-6/hooks/qtbase-setup-hook.sh

···

       53
       53
        
               # Prevent this hook from running multiple times

     

       54
       54
        
               dontPatchMkspecs=1

     

       55
       55
        
       

     

       56
       56
       -
               local bin="${!outputBin}"

     

       57
       57
       -
               local dev="${!outputDev}"

     

       58
       58
       -
               local doc="${!outputDoc}"

     

       59
       56
        
               local lib="${!outputLib}"

     

       60
       57
        
       

     

       61
       61
       -
               moveToOutput "mkspecs"   "$dev"

     

       62
       62
       -
               moveToOutput "modules"   "$dev"

     

       63
       63
       -
               moveToOutput "lib/*.prl" "$dev"

     

       64
       64
       -
       

     

       65
       65
       -
               if [ -d "$dev/mkspecs/modules" ]; then

     

       66
       66
       -
                   fixQtModulePaths "$dev/mkspecs/modules"

     

       58
       58
       +
               if [ -d "$lib/mkspecs/modules" ]; then

     

       59
       59
       +
                   fixQtModulePaths "$lib/mkspecs/modules"

     

       67
       60
        
               fi

     

       68
       61
        
       

     

       69
       69
       -
               if [ -d "$dev/mkspecs" ]; then

     

       70
       70
       -
                   fixQtBuiltinPaths "$dev/mkspecs" '*.pr?'

     

       62
       62
       +
               if [ -d "$lib/mkspecs" ]; then

     

       63
       63
       +
                   fixQtBuiltinPaths "$lib/mkspecs" '*.pr?'

     

       71
       64
        
               fi

     

       72
       65
        
       

     

       73
       73
       -
               if [ -d "$dev/lib" ]; then

     

       74
       74
       -
                   fixQtBuiltinPaths "$dev/lib" '*.pr?'

     

       66
       66
       +
               if [ -d "$lib/lib" ]; then

     

       67
       67
       +
                   fixQtBuiltinPaths "$lib/lib" '*.pr?'

     

       75
       68
        
               fi

     

       76
       69
        
           }

     

       77
       70
        
           if [ -z "${dontPatchMkspecs-}" ]; then