Unverified Commit 1cf3cca8 authored by Nick Cao's avatar Nick Cao
Browse files

qt6: move all qmake related files to dev output

parent bf30644a

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

+5 −3
Original line number Diff line number Diff line
@@ -59,6 +59,8 @@ else # Only set up Qt once. 
        local lib="${!outputLib}"



        moveToOutput "mkspecs"   "$dev"

        moveToOutput "modules"   "$dev"

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



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

            fixQtModulePaths "$dev/mkspecs/modules"
@@ -68,8 +70,8 @@ else # Only set up Qt once. 
            fixQtBuiltinPaths "$dev/mkspecs" '*.pr?'

        fi



        if [ -d "$lib" ]; then

            fixQtBuiltinPaths "$lib" '*.pr?'

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

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

        fi

    }

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

pkgs/development/libraries/qt-6/modules/qtbase.nix

+6 −8
Original line number Diff line number Diff line
@@ -233,10 +233,6 @@ stdenv.mkDerivation rec { 


  outputs = [ "out" "dev" ];



  postInstall = ''

    moveToOutput "mkspecs" "$dev"

  '';



  devTools = [

    "libexec/moc"

    "libexec/rcc"
@@ -264,10 +260,12 @@ stdenv.mkDerivation rec { 
  ];



  postFixup = ''

    # Don't retain build-time dependencies like gdb.

    sed '/QMAKE_DEFAULT_.*DIRS/ d' -i $dev/mkspecs/qconfig.pri

    fixQtModulePaths "''${!outputDev}/mkspecs/modules"

    fixQtBuiltinPaths "''${!outputDev}" '*.pr?'

    moveToOutput "mkspecs"   "$dev"

    moveToOutput "modules"   "$dev"

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



    fixQtModulePaths  "$dev/mkspecs/modules"

    fixQtBuiltinPaths "$dev" '*.pr?'



    # Move development tools to $dev

    moveQtDevTools