diff options
| author | Luke Granger-Brown <git@lukegb.com> | 2024-02-23 17:32:03 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-02-23 17:32:03 +0000 |
| commit | 81dbb26197a4de5f3da0b1c1ac9963919777cc94 (patch) | |
| tree | c1a958ac46f1f153636ecd37869442685c0eb380 /pkgs/desktops | |
| parent | d08f9b58330f64cab4e402dcb7d1c641dc0f78e5 (diff) | |
| parent | 2da1d924f777489216297acc829c6d770ae5b6e7 (diff) | |
Merge pull request #290900 from simonhollingshead/deepin-reader-cpp14
deepin.deepin-reader: Build tests with C++14.
Diffstat (limited to 'pkgs/desktops')
| -rw-r--r-- | pkgs/desktops/deepin/apps/deepin-reader/0001-build-tests-with-cpp-14.patch | 13 | ||||
| -rw-r--r-- | pkgs/desktops/deepin/apps/deepin-reader/default.nix | 2 |
2 files changed, 15 insertions, 0 deletions
diff --git a/pkgs/desktops/deepin/apps/deepin-reader/0001-build-tests-with-cpp-14.patch b/pkgs/desktops/deepin/apps/deepin-reader/0001-build-tests-with-cpp-14.patch new file mode 100644 index 0000000000000..cf88eb6db0747 --- /dev/null +++ b/pkgs/desktops/deepin/apps/deepin-reader/0001-build-tests-with-cpp-14.patch @@ -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 diff --git a/pkgs/desktops/deepin/apps/deepin-reader/default.nix b/pkgs/desktops/deepin/apps/deepin-reader/default.nix index e477917f5a1b1..0d95349bf56e4 100644 --- a/pkgs/desktops/deepin/apps/deepin-reader/default.nix +++ b/pkgs/desktops/deepin/apps/deepin-reader/default.nix @@ -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 \ |