pyrox.dev / nixpkgs
lol
fork atom

deepin-image-viewer: 5.9.13 -> 6.0.2

rewine eb4b8252 7ed1e608

+15 -54
unified split
-25
pkgs/desktops/deepin/apps/deepin-image-viewer/0001-fix-install-path-for-nix.patch
··· 1 - From c2fa29800c64f5bda04203bb2eb1845b29c1de3c Mon Sep 17 00:00:00 2001 2 - From: rewine <luhongxu@deepin.org> 3 - Date: Fri, 25 Mar 2022 18:20:17 +0800 4 - Subject: [PATCH] fix install path for nix 5 - 6 - --- 7 - qimage-plugins/libraw/CMakeLists.txt | 3 +-- 8 - 1 file changed, 1 insertion(+), 2 deletions(-) 9 - 10 - diff --git a/qimage-plugins/libraw/CMakeLists.txt b/qimage-plugins/libraw/CMakeLists.txt 11 - index 4bfd85ad..00d11bd3 100644 12 - --- a/qimage-plugins/libraw/CMakeLists.txt 13 - +++ b/qimage-plugins/libraw/CMakeLists.txt 14 - @@ -44,7 +44,6 @@ target_include_directories(xraw PUBLIC ${RAW_INCLUDE_DIRS} ${Qt5Gui_INCLUDE_DIR 15 - 16 - target_link_libraries(${CMD_NAME} Qt5::Core Qt5::Gui raw) 17 - 18 - -install(TARGETS ${CMD_NAME} DESTINATION ${Qt5Core_DIR}/../../qt5/plugins/imageformats) 19 - - 20 - +install(TARGETS ${CMD_NAME} DESTINATION qt5/plugins/imageformats) 21 - 22 - QT5_USE_MODULES(${PROJECT_NAME} Core Gui) 23 - -- 24 - 2.35.1 25 -
+15 -29
pkgs/desktops/deepin/apps/deepin-image-viewer/default.nix
··· 2 2 , lib 3 3 , fetchFromGitHub 4 4 , fetchpatch 5 + , cmake 6 + , pkg-config 7 + , qttools 8 + , wrapQtAppsHook 9 + , qt5platform-plugins 5 10 , qtbase 6 - , qtsvg 7 11 , dtkwidget 8 - , qt5integration 9 - , qt5platform-plugins 12 + , dtkdeclarative 13 + , deepin-ocr-plugin-manager 10 14 , gio-qt 11 15 , udisks2-qt5 12 16 , image-editor 13 - , cmake 14 - , pkg-config 15 - , qttools 16 - , wrapQtAppsHook 17 17 , libraw 18 18 , libexif 19 + , freeimage 19 20 }: 20 21 21 22 stdenv.mkDerivation rec { 22 23 pname = "deepin-image-viewer"; 23 - version = "5.9.13"; 24 + version = "6.0.2"; 24 25 25 26 src = fetchFromGitHub { 26 27 owner = "linuxdeepin"; 27 28 repo = pname; 28 29 rev = version; 29 - sha256 = "sha256-T/hbygnbao5rbw0gHH0ULHOz/2j70ktyzYGWXPDCJoQ="; 30 + hash = "sha256-YT3wK+ELXjgtsXbkiCjQF0zczQi89tF1kyIQtl9/mMA="; 30 31 }; 31 32 32 33 patches = [ 33 - ./0001-fix-install-path-for-nix.patch 34 - (fetchpatch { 35 - name = "chore-use-GNUInstallDirs-in-CmakeLists.patch"; 36 - url = "https://github.com/linuxdeepin/deepin-image-viewer/commit/4a046e6207fea306e592fddc33c1285cf719a63d.patch"; 37 - sha256 = "sha256-aIgYmq6WDfCE+ZcD0GshxM+QmBWZGjh9MzZcTMrhBJ0="; 38 - }) 39 34 (fetchpatch { 40 35 name = "fix-build-with-libraw-0_21.patch"; 41 36 url = "https://raw.githubusercontent.com/archlinux/svntogit-community/2ff11979704dd7156a7e7c3bae9b30f08894063d/trunk/libraw-0.21.patch"; 42 - sha256 = "sha256-I/w4uiANT8Z8ud/F9WCd3iRHOfplu3fpqnu8ZIs4C+w="; 37 + hash = "sha256-I/w4uiANT8Z8ud/F9WCd3iRHOfplu3fpqnu8ZIs4C+w="; 43 38 }) 44 39 ]; 45 40 46 - postPatch = '' 47 - substituteInPlace src/com.deepin.ImageViewer.service \ 48 - --replace "/usr/bin/deepin-image-viewer" "$out/bin/deepin-image-viewer" 49 - ''; 50 - 51 41 nativeBuildInputs = [ 52 42 cmake 53 43 pkg-config ··· 56 46 ]; 57 47 58 48 buildInputs = [ 59 - qtbase 60 - qtsvg 61 - dtkwidget 62 - qt5integration 63 49 qt5platform-plugins 64 - gio-qt 65 - udisks2-qt5 66 - image-editor 50 + dtkwidget 51 + dtkdeclarative 52 + deepin-ocr-plugin-manager 67 53 libraw 68 - libexif 54 + freeimage 69 55 ]; 70 56 71 57 strictDeps = true;