commit 00c5aa27ba8643fc8cecf937a78085ed1f4a9a7f

+13 -13

pkgs/applications/misc/crow-translate/default.nix

··· 34 34 qonlinetranslator = fetchFromGitHub { 35 35 owner = "crow-translate"; 36 36 repo = "QOnlineTranslator"; 37 - rev = "1.4.4"; 38 - sha256 = "sha256-ogO6ovkQmyvTUPCYAQ4U3AxOju9r3zHB9COnAAfKSKA="; 37 + rev = "df89083d2f680a8f856b1df00b8846f995cf1fae"; 38 + sha256 = "sha256-I64KGInnYd/QdI5kANJERsF95wMvRlr8kgQhUqXXN/0="; 39 39 }; 40 40 circleflags = fetchFromGitHub { 41 41 owner = "HatScripts"; 42 42 repo = "circle-flags"; 43 - rev = "v2.1.0"; 44 - sha256 = "sha256-E0iTDjicfdGqK4r+anUZanEII9SBafeEUcMLf7BGdp0="; 43 + rev = "v2.3.0"; 44 + sha256 = "sha256-KabmewF1Xf/1JQuzolrlRyLJR8O5j+/iT+29/QtOQVE="; 45 45 }; 46 - we10x = fetchFromGitHub { 47 - owner = "yeyushengfan258"; 48 - repo = "We10X-icon-theme"; 49 - rev = "bd2c68482a06d38b2641503af1ca127b9e6540db"; 50 - sha256 = "sha256-T1oPstmjLffnVrIIlmTTpHv38nJHBBGJ070ilRwAjk8="; 46 + fluent = fetchFromGitHub { 47 + owner = "vinceliuice"; 48 + repo = "Fluent-icon-theme"; 49 + rev = "2021-08-15"; 50 + sha256 = "sha256-uBu0vbKfhhnPKGwrnSBjPwS9ncH1iAlmeefAcpckOm4="; 51 51 }; 52 52 in 53 53 mkDerivation rec { 54 54 pname = "crow-translate"; 55 - version = "2.8.4"; 55 + version = "2.8.7"; 56 56 57 57 src = fetchFromGitHub { 58 58 owner = "crow-translate"; 59 59 repo = pname; 60 60 rev = version; 61 - sha256 = "sha256-TPJgKTZqsh18BQGFWgp0wsw1ehtI8ydQ7ZCvYNX6pH8="; 61 + sha256 = "sha256-0bq9itbFyzdOhdNuUtdCYLTCIhc91MM+YRhJgXC5PPw="; 62 62 }; 63 63 64 64 patches = [ 65 65 (substituteAll { 66 66 src = ./dont-fetch-external-libs.patch; 67 - inherit singleapplication qtaskbarcontrol qhotkey qonlinetranslator circleflags we10x; 67 + inherit singleapplication qtaskbarcontrol qhotkey qonlinetranslator circleflags fluent; 68 68 }) 69 69 (substituteAll { 70 70 # See https://github.com/NixOS/nixpkgs/issues/86054 ··· 75 75 76 76 postPatch = '' 77 77 cp -r ${circleflags}/flags/* data/icons 78 - cp -r ${we10x}/src/* data/icons 78 + cp -r ${fluent}/src/* data/icons 79 79 ''; 80 80 81 81 nativeBuildInputs = [ cmake extra-cmake-modules qttools ];

+13 -13

pkgs/applications/misc/crow-translate/dont-fetch-external-libs.patch

··· 1 1 diff --git i/CMakeLists.txt w/CMakeLists.txt 2 - index 0cd2140..16e3190 100644 2 + index faa9417..059b899 100644 3 3 --- i/CMakeLists.txt 4 4 +++ w/CMakeLists.txt 5 - @@ -97,13 +97,11 @@ qt5_add_translation(QM_FILES 5 + @@ -101,13 +101,11 @@ qt5_add_translation(QM_FILES 6 6 ) 7 7 8 8 configure_file(src/cmake.h.in cmake.h) 9 9 -configure_file(data/icons/flags.qrc ${CircleFlags_SOURCE_DIR}/flags/flags.qrc COPYONLY) 10 - -configure_file(data/icons/we10x.qrc ${We10X_SOURCE_DIR}/src/we10x.qrc COPYONLY) 10 + -configure_file(data/icons/fluent-icon-theme.qrc ${FluentIconTheme_SOURCE_DIR}/src/fluent-icon-theme.qrc COPYONLY) 11 11 12 12 add_executable(${PROJECT_NAME} 13 13 - ${CircleFlags_SOURCE_DIR}/flags/flags.qrc 14 14 + data/icons/flags.qrc 15 15 ${QM_FILES} 16 - - ${We10X_SOURCE_DIR}/src/we10x.qrc 17 - + data/icons/we10x.qrc 16 + - ${FluentIconTheme_SOURCE_DIR}/src/fluent-icon-theme.qrc 17 + + data/icons/fluent-icon-theme.qrc 18 18 data/icons/engines/engines.qrc 19 19 src/addlanguagedialog.cpp 20 20 src/addlanguagedialog.ui 21 21 diff --git i/cmake/ExternalLibraries.cmake w/cmake/ExternalLibraries.cmake 22 - index d738716..fb01f3d 100644 22 + index e2501e1..e15ce6c 100644 23 23 --- i/cmake/ExternalLibraries.cmake 24 24 +++ w/cmake/ExternalLibraries.cmake 25 25 @@ -2,34 +2,28 @@ include(FetchContent) ··· 46 46 47 47 FetchContent_Declare(QOnlineTranslator 48 48 - GIT_REPOSITORY https://github.com/crow-translate/QOnlineTranslator 49 - - GIT_TAG 1.4.4 49 + - GIT_TAG df89083d2f680a8f856b1df00b8846f995cf1fae 50 50 + SOURCE_DIR @qonlinetranslator@ 51 51 ) 52 52 53 53 FetchContent_Declare(CircleFlags 54 54 - GIT_REPOSITORY https://github.com/HatScripts/circle-flags 55 - - GIT_TAG v2.1.0 55 + - GIT_TAG v2.3.0 56 56 + SOURCE_DIR @circleflags@ 57 57 ) 58 58 59 - FetchContent_Declare(We10X 60 - - GIT_REPOSITORY https://github.com/yeyushengfan258/We10X-icon-theme 61 - - GIT_TAG bd2c68482a06d38b2641503af1ca127b9e6540db 62 - + SOURCE_DIR @we10x@ 59 + FetchContent_Declare(FluentIconTheme 60 + - GIT_REPOSITORY https://github.com/vinceliuice/Fluent-icon-theme 61 + - GIT_TAG 2021-08-15 62 + + SOURCE_DIR @fluent@ 63 63 ) 64 64 65 - FetchContent_MakeAvailable(SingleApplication QTaskbarControl QHotkey QOnlineTranslator CircleFlags We10X) 65 + FetchContent_MakeAvailable(SingleApplication QTaskbarControl QHotkey QOnlineTranslator CircleFlags FluentIconTheme)

+5 -5

pkgs/applications/misc/crow-translate/fix-qttranslations-path.patch

··· 1 - diff --git c/src/settings/appsettings.cpp i/src/settings/appsettings.cpp 2 - index ff99f64..fa929ae 100644 3 - --- c/src/settings/appsettings.cpp 4 - +++ i/src/settings/appsettings.cpp 5 - @@ -80,7 +80,7 @@ void AppSettings::applyLanguage(QLocale::Language lang) 1 + diff --git i/src/settings/appsettings.cpp w/src/settings/appsettings.cpp 2 + index aa8b357..15e4f74 100644 3 + --- i/src/settings/appsettings.cpp 4 + +++ w/src/settings/appsettings.cpp 5 + @@ -81,7 +81,7 @@ void AppSettings::applyLanguage(QLocale::Language lang) 6 6 QLocale::setDefault(locale); 7 7 8 8 s_appTranslator.load(locale, QStringLiteral(PROJECT_NAME), QStringLiteral("_"), QStandardPaths::locate(QStandardPaths::AppDataLocation, QStringLiteral("translations"), QStandardPaths::LocateDirectory));