pyrox.dev / nixpkgs
lol
fork atom

Merge pull request #125137 from sikmir/crow-translate

crow-translate: 2.8.1 → 2.8.4

authored by

Artturi and committed by
GitHub c395dc58 4614bbbe

+36 -19
unified split
+18 -9
pkgs/applications/misc/crow-translate/default.nix
··· 34 34 qonlinetranslator = fetchFromGitHub { 35 35 owner = "crow-translate"; 36 36 repo = "QOnlineTranslator"; 37 - rev = "1.4.1"; 38 - sha256 = "1c6a8mdxms5vh8l7shi2kqdhafbzm50pbz6g1hhgg6qslla0vfn0"; 37 + rev = "1.4.4"; 38 + sha256 = "sha256-ogO6ovkQmyvTUPCYAQ4U3AxOju9r3zHB9COnAAfKSKA="; 39 39 }; 40 40 circleflags = fetchFromGitHub { 41 41 owner = "HatScripts"; 42 42 repo = "circle-flags"; 43 - rev = "v2.0.0"; 44 - sha256 = "1xz5b6nhcxxzalcgwnw36npap71i70s50g6b63avjgjkwz1ys5j4"; 43 + rev = "v2.1.0"; 44 + sha256 = "sha256-E0iTDjicfdGqK4r+anUZanEII9SBafeEUcMLf7BGdp0="; 45 + }; 46 + we10x = fetchFromGitHub { 47 + owner = "yeyushengfan258"; 48 + repo = "We10X-icon-theme"; 49 + rev = "bd2c68482a06d38b2641503af1ca127b9e6540db"; 50 + sha256 = "sha256-T1oPstmjLffnVrIIlmTTpHv38nJHBBGJ070ilRwAjk8="; 45 51 }; 46 52 in 47 53 mkDerivation rec { 48 54 pname = "crow-translate"; 49 - version = "2.8.1"; 55 + version = "2.8.4"; 50 56 51 57 src = fetchFromGitHub { 52 58 owner = "crow-translate"; 53 - repo = "crow-translate"; 59 + repo = pname; 54 60 rev = version; 55 - sha256 = "sha256-fmlNUhNorV/MUdfdDXM6puAblTTa6p2slVT/EKy5THg="; 61 + sha256 = "sha256-TPJgKTZqsh18BQGFWgp0wsw1ehtI8ydQ7ZCvYNX6pH8="; 56 62 }; 57 63 58 64 patches = [ 59 65 (substituteAll { 60 66 src = ./dont-fetch-external-libs.patch; 61 - inherit singleapplication qtaskbarcontrol qhotkey qonlinetranslator circleflags; 67 + inherit singleapplication qtaskbarcontrol qhotkey qonlinetranslator circleflags we10x; 62 68 }) 63 69 (substituteAll { 64 70 # See https://github.com/NixOS/nixpkgs/issues/86054 ··· 67 73 }) 68 74 ]; 69 75 70 - postPatch = "cp -r ${circleflags}/flags/* data/icons"; 76 + postPatch = '' 77 + cp -r ${circleflags}/flags/* data/icons 78 + cp -r ${we10x}/src/* data/icons 79 + ''; 71 80 72 81 nativeBuildInputs = [ cmake extra-cmake-modules qttools ]; 73 82
+18 -10
pkgs/applications/misc/crow-translate/dont-fetch-external-libs.patch
··· 1 1 diff --git i/CMakeLists.txt w/CMakeLists.txt 2 - index 2576203..26162a0 100644 2 + index 0cd2140..16e3190 100644 3 3 --- i/CMakeLists.txt 4 4 +++ w/CMakeLists.txt 5 - @@ -91,12 +91,11 @@ qt5_add_translation(QM_FILES 5 + @@ -97,13 +97,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 11 11 12 add_executable(${PROJECT_NAME} 12 - ${QM_FILES} 13 - data/icons/engines/engines.qrc 14 13 - ${CircleFlags_SOURCE_DIR}/flags/flags.qrc 15 14 + data/icons/flags.qrc 15 + ${QM_FILES} 16 + - ${We10X_SOURCE_DIR}/src/we10x.qrc 17 + + data/icons/we10x.qrc 18 + data/icons/engines/engines.qrc 16 19 src/addlanguagedialog.cpp 17 20 src/addlanguagedialog.ui 18 - src/cli.cpp 19 21 diff --git i/cmake/ExternalLibraries.cmake w/cmake/ExternalLibraries.cmake 20 - index 21eba0a..b613d3e 100644 22 + index d738716..fb01f3d 100644 21 23 --- i/cmake/ExternalLibraries.cmake 22 24 +++ w/cmake/ExternalLibraries.cmake 23 - @@ -2,29 +2,24 @@ include(FetchContent) 25 + @@ -2,34 +2,28 @@ include(FetchContent) 24 26 25 27 set(QAPPLICATION_CLASS QApplication) 26 28 FetchContent_Declare(SingleApplication ··· 44 46 45 47 FetchContent_Declare(QOnlineTranslator 46 48 - GIT_REPOSITORY https://github.com/crow-translate/QOnlineTranslator 47 - - GIT_TAG 1.4.1 49 + - GIT_TAG 1.4.4 48 50 + SOURCE_DIR @qonlinetranslator@ 49 51 ) 50 52 51 53 FetchContent_Declare(CircleFlags 52 54 - GIT_REPOSITORY https://github.com/HatScripts/circle-flags 53 - - GIT_TAG v2.0.0 55 + - GIT_TAG v2.1.0 54 56 + SOURCE_DIR @circleflags@ 55 57 ) 56 58 57 - FetchContent_MakeAvailable(SingleApplication QTaskbarControl QHotkey QOnlineTranslator CircleFlags) 59 + FetchContent_Declare(We10X 60 + - GIT_REPOSITORY https://github.com/yeyushengfan258/We10X-icon-theme 61 + - GIT_TAG bd2c68482a06d38b2641503af1ca127b9e6540db 62 + + SOURCE_DIR @we10x@ 63 + ) 64 + 65 + FetchContent_MakeAvailable(SingleApplication QTaskbarControl QHotkey QOnlineTranslator CircleFlags We10X)