diff options
| author | Nick Cao <nickcao@nichi.co> | 2023-09-07 10:29:21 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-09-07 10:29:21 -0400 |
| commit | 682985913da94b692c46f1133a8f1b9ca5706b04 (patch) | |
| tree | 472dbd8aa1f2f85c282ff934e78f103be305a79c /pkgs/desktops | |
| parent | 44d5c19558a09b5da851d01c58d6b8ca1f779412 (diff) | |
| parent | c53ada6cab1e5d63a04d9e3336321ef3e3cd0a80 (diff) | |
Merge pull request #253841 from wineee/deepin-reader
deepin.deepin-reader: 5.10.29 -> 6.0.2
Diffstat (limited to 'pkgs/desktops')
| -rw-r--r-- | pkgs/desktops/deepin/apps/deepin-reader/default.nix | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/pkgs/desktops/deepin/apps/deepin-reader/default.nix b/pkgs/desktops/deepin/apps/deepin-reader/default.nix index 952a626b9fb78..23891f8ab9c91 100644 --- a/pkgs/desktops/deepin/apps/deepin-reader/default.nix +++ b/pkgs/desktops/deepin/apps/deepin-reader/default.nix @@ -17,24 +17,26 @@ , openjpeg , djvulibre , qtbase +, gtest }: stdenv.mkDerivation rec { pname = "deepin-reader"; - version = "5.10.29"; + version = "6.0.2"; src = fetchFromGitHub { owner = "linuxdeepin"; repo = pname; rev = version; - sha256 = "sha256-IpgmTmnrPWc9EFZVM+S2nFxdpPjbgXqEWUnK/O9FmUg="; + hash = "sha256-69NCxa20wp/tyyGGH/FbHhZ83LECbJWAzaLRo7iYreA="; }; - patches = [ ./use-pkg-config.diff ]; - + # don't use vendored htmltopdf postPatch = '' - substituteInPlace reader/{reader.pro,document/Model.cpp} htmltopdf/htmltopdf.pro 3rdparty/deepin-pdfium/src/src.pro \ - --replace "/usr" "$out" + substituteInPlace deepin_reader.pro \ + --replace "SUBDIRS += htmltopdf" " " + substituteInPlace reader/document/Model.cpp \ + --replace "/usr/lib/deepin-reader/htmltopdf" "htmltopdf" ''; nativeBuildInputs = [ @@ -56,6 +58,7 @@ stdenv.mkDerivation rec { libspectre djvulibre openjpeg + gtest ]; qmakeFlags = [ |