swendel/nixpkgs
1
0
Fork 0
mirror of https://github.com/SebastianWendel/nixpkgs.git synced 2024-09-20 04:19:00 +02:00
Code Issues Packages Projects Releases Wiki Activity

deepin.deepin-reader: Build tests with C++14.

Browse source 
This makes them compatible with newer versions of gtest.
This commit is contained in:
Simon Hollingshead 2024-02-23 14:47:03 +00:00
parent a331a49cf7
commit 2da1d924f7
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 \