cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

Merge pull request #290900 from simonhollingshead/deepin-reader-cpp14

Browse source 
deepin.deepin-reader: Build tests with C++14.
This commit is contained in:
Luke Granger-Brown 2024-02-23 17:32:03 +00:00 committed by GitHub
commit 81dbb26197
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 15 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
pkgs/desktops/deepin/apps/deepin-reader/0001-build-tests-with-cpp-14.patch Normal file
View file

@ -0,0 +1,13 @@
diff --git a/tests/tests.pro b/tests/tests2.pro
index 314cad227646..48f1c66ee3f7 100644
--- a/tests/tests.pro
+++ b/tests/tests.pro
@@ -6,7 +6,7 @@ QT += core gui sql printsupport dbus testlib widgets
#QMAKE_CXXFLAGS += -g -fsanitize=undefined,address -O2
#QMAKE_LFLAGS += -g -fsanitize=undefined,address -O2
-CONFIG += c++11 link_pkgconfig resources_big testcase no_testcase_installs
+CONFIG += c++14 link_pkgconfig resources_big testcase no_testcase_installs
#访问私有方法 -fno-access-control
QMAKE_CXXFLAGS += -g -Wall -fprofile-arcs -ftest-coverage -fno-access-control -O0 -fno-inline

2
pkgs/desktops/deepin/apps/deepin-reader/default.nix
View file

@ -31,6 +31,8 @@ stdenv.mkDerivation rec {
hash = "sha256-G5UZ8lBrUo5G3jMae70p/zi9kOVqHWMNCedOy45L1PA=";
};
patches = [ ./0001-build-tests-with-cpp-14.patch ];
# don't use vendored htmltopdf
postPatch = ''
substituteInPlace deepin_reader.pro \