diff options
| author | Alyssa Ross <hi@alyssa.is> | 2024-02-26 16:20:28 +0100 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2024-02-26 16:20:28 +0100 |
| commit | 647438344bfc1f77791391e2b4f98eef865c63dc (patch) | |
| tree | ef580867fc6cc413940e4330d939cf1afda082cb /nixpkgs/pkgs/desktops/deepin | |
| parent | b084c6a0fab7f32c904c5c8e8db8dddcefbe507f (diff) | |
| parent | e3474e1d1e53b70e2b2af73ea26d6340e82f6b8b (diff) | |
| download | nixlib-647438344bfc1f77791391e2b4f98eef865c63dc.tar nixlib-647438344bfc1f77791391e2b4f98eef865c63dc.tar.gz nixlib-647438344bfc1f77791391e2b4f98eef865c63dc.tar.bz2 nixlib-647438344bfc1f77791391e2b4f98eef865c63dc.tar.lz nixlib-647438344bfc1f77791391e2b4f98eef865c63dc.tar.xz nixlib-647438344bfc1f77791391e2b4f98eef865c63dc.tar.zst nixlib-647438344bfc1f77791391e2b4f98eef865c63dc.zip | |
Merge commit 'e3474e1d1e53'
Diffstat (limited to 'nixpkgs/pkgs/desktops/deepin')
4 files changed, 15 insertions, 6 deletions
diff --git a/nixpkgs/pkgs/desktops/deepin/apps/deepin-reader/0001-build-tests-with-cpp-14.patch b/nixpkgs/pkgs/desktops/deepin/apps/deepin-reader/0001-build-tests-with-cpp-14.patch new file mode 100644 index 000000000000..cf88eb6db074 --- /dev/null +++ b/nixpkgs/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/nixpkgs/pkgs/desktops/deepin/apps/deepin-reader/default.nix b/nixpkgs/pkgs/desktops/deepin/apps/deepin-reader/default.nix index e477917f5a1b..0d95349bf56e 100644 --- a/nixpkgs/pkgs/desktops/deepin/apps/deepin-reader/default.nix +++ b/nixpkgs/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 \ diff --git a/nixpkgs/pkgs/desktops/deepin/core/dde-gsettings-schemas/default.nix b/nixpkgs/pkgs/desktops/deepin/core/dde-gsettings-schemas/default.nix index a609d707a03c..c1a26e100a29 100644 --- a/nixpkgs/pkgs/desktops/deepin/core/dde-gsettings-schemas/default.nix +++ b/nixpkgs/pkgs/desktops/deepin/core/dde-gsettings-schemas/default.nix @@ -9,7 +9,6 @@ , dde-file-manager , deepin-desktop-schemas , deepin-movie-reborn -, deepin-screen-recorder , deepin-system-monitor , gsettings-desktop-schemas , extraGSettingsOverrides ? "" @@ -24,7 +23,6 @@ let dde-file-manager deepin-desktop-schemas deepin-movie-reborn - deepin-screen-recorder deepin-system-monitor gsettings-desktop-schemas # dde-appearance need org.gnome.desktop.background ] ++ extraGSettingsOverridePackages; diff --git a/nixpkgs/pkgs/desktops/deepin/library/dtkgui/default.nix b/nixpkgs/pkgs/desktops/deepin/library/dtkgui/default.nix index 7d21911be6b1..0094f5a305f8 100644 --- a/nixpkgs/pkgs/desktops/deepin/library/dtkgui/default.nix +++ b/nixpkgs/pkgs/desktops/deepin/library/dtkgui/default.nix @@ -12,8 +12,6 @@ , qtimageformats , lxqt , librsvg -, freeimage -, libraw }: stdenv.mkDerivation rec { @@ -50,8 +48,6 @@ stdenv.mkDerivation rec { qtbase lxqt.libqtxdg librsvg - freeimage - libraw ]; propagatedBuildInputs = [ |