Commit 2dee17ab authored by Adkins, Cameron's avatar Adkins, Cameron
Browse files

qt6: fix translations install on windows

parent 5a358027

pkgs/development/libraries/qt-6/default.nix

+1 −1
Original line number Diff line number Diff line
@@ -159,7 +159,7 @@ let 
      qtsvg = callPackage ./modules/qtsvg.nix { };

      qtscxml = callPackage ./modules/qtscxml.nix { };

      qttools = callPackage ./modules/qttools { };

      qttranslations = callPackage ./modules/qttranslations.nix { };

      qttranslations = callPackage ./modules/qttranslations { };

      qtvirtualkeyboard = callPackage ./modules/qtvirtualkeyboard.nix { };

      qtwayland = callPackage ./modules/qtwayland.nix { };

      qtwebchannel = callPackage ./modules/qtwebchannel.nix { };

pkgs/development/libraries/qt-6/modules/qttranslations.nix→pkgs/development/libraries/qt-6/modules/qttranslations/default.nix

+4 −1
Original line number Diff line number Diff line 
{

  qtModule,

  qttools,

  qttools

}:



qtModule {

  pname = "qttranslations";

  nativeBuildInputs = [ qttools ];

  outputs = [ "out" ];

  patches = [

    ./qttranslations-windows-install.patch

  ];

}

pkgs/development/libraries/qt-6/modules/qttranslations/qttranslations-windows-install.patch

0 → 100644
+28 −0
Original line number Diff line number Diff line 
diff --git a/translations/CMakeLists.txt b/translations/CMakeLists.txt

index 8b903d2..b1cf2be 100644

--- a/translations/CMakeLists.txt

+++ b/translations/CMakeLists.txt

@@ -180,9 +180,9 @@ file(GLOB en_ts_files "${en_ts_file_dir}/*.ts")

 list(APPEND ts_files ${en_ts_files})

 

 if(QT_WILL_INSTALL)

-    set(qm_output_dir "${QT_BUILD_DIR}/${INSTALL_TRANSLATIONSDIR}")

+    set(qm_output_dir "${QT_BUILD_DIR}/$ENV{out}/translations")

 else()

-    set(qm_output_dir "${QT_BUILD_INTERNALS_RELOCATABLE_INSTALL_PREFIX}/${INSTALL_TRANSLATIONSDIR}")

+    set(qm_output_dir "${QT_BUILD_INTERNALS_RELOCATABLE_INSTALL_PREFIX}/$ENV{out}/translations")

 endif()

 

 set_source_files_properties(${ts_files} PROPERTIES OUTPUT_LOCATION "${qm_output_dir}")

@@ -191,9 +191,9 @@ qt_add_lrelease(updateqm

     NO_GLOBAL_TARGET

     QM_FILES_OUTPUT_VARIABLE qm_files

     OPTIONS "-silent")

-qt_install(FILES ${qm_files} DESTINATION "${INSTALL_TRANSLATIONSDIR}")

+qt_install(FILES ${qm_files} DESTINATION "$ENV{out}/translations")

 

-qt_path_join(catalogs_file_install_dir ${QT_INSTALL_DIR} ${INSTALL_TRANSLATIONSDIR})

+qt_path_join(catalogs_file_install_dir ${QT_INSTALL_DIR} $ENV{out}/translations)

 qt_copy_or_install(FILES ${catalogs_file} DESTINATION "${catalogs_file_install_dir}")

 

 # Custom target to add modified ts files to git