about summary refs log tree commit diff
path: root/pkgs/desktops
diff options
context:
space:
mode:
Diffstat (limited to 'pkgs/desktops')
-rw-r--r--pkgs/desktops/deepin/apps/deepin-reader/use-pkg-config.diff46
-rw-r--r--pkgs/desktops/gnome/extensions/icon-hider/default.nix2
-rw-r--r--pkgs/desktops/gnome/extensions/no-title-bar/default.nix2
-rw-r--r--pkgs/desktops/gnome/extensions/taskwhisperer/default.nix2
4 files changed, 3 insertions, 49 deletions
diff --git a/pkgs/desktops/deepin/apps/deepin-reader/use-pkg-config.diff b/pkgs/desktops/deepin/apps/deepin-reader/use-pkg-config.diff
deleted file mode 100644
index 7993cecd30add..0000000000000
--- a/pkgs/desktops/deepin/apps/deepin-reader/use-pkg-config.diff
+++ /dev/null
@@ -1,46 +0,0 @@
-diff --git a/3rdparty/deepin-pdfium/src/3rdparty/pdfium/pdfium.pri b/3rdparty/deepin-pdfium/src/3rdparty/pdfium/pdfium.pri
-index 3e04f340..894b0ac7 100755
---- a/3rdparty/deepin-pdfium/src/3rdparty/pdfium/pdfium.pri
-+++ b/3rdparty/deepin-pdfium/src/3rdparty/pdfium/pdfium.pri
-@@ -20,13 +20,8 @@ DEFINES +=  USE_SYSTEM_LIBJPEG \
-             USE_SYSTEM_LIBOPENJPEG2 \
-             USE_SYSTEM_FREETYPE
- 
--INCLUDEPATH += /usr/include/openjpeg-2.3 \
--               /usr/include/openjpeg-2.4 \
--               /usr/include/freetype2 \
--               /usr/include/freetype2/freetype \
--               /usr/include/freetype2/freetype/config
--
--LIBS += -lopenjp2 -llcms2 -lfreetype
-+CONFIG += link_pkgconfig
-+PKGCONFIG += libopenjp2 lcms2 freetype2
- 
- #QMAKE_CXXFLAGS += "-Wc++11-narrowing"  #is_clang
- #QMAKE_CXXFLAGS += "-Wno-inconsistent-missing-override"  #is_clang Suppress no override warning for overridden functions.
-diff --git a/3rdparty/deepin-pdfium/src/src.pro b/3rdparty/deepin-pdfium/src/src.pro
-index 196b91d3..bda71ff4 100755
---- a/3rdparty/deepin-pdfium/src/src.pro
-+++ b/3rdparty/deepin-pdfium/src/src.pro
-@@ -2,7 +2,9 @@ TARGET = $$PWD/../lib/deepin-pdfium
- 
- TEMPLATE = lib
- 
--CONFIG += c++14
-+CONFIG += c++14 link_pkgconfig
-+
-+PKGCONFIG += chardet
- 
- ###安全漏洞检测
- #QMAKE_CXX += -g -fsanitize=undefined,address -O2
-@@ -28,10 +30,6 @@ include($$PWD/3rdparty/pdfium/pdfium.pri)
- 
- INCLUDEPATH += $$PWD/../include
- 
--INCLUDEPATH += /usr/include/chardet
--
--LIBS += -lchardet
--
- public_headers += \
-     $$PWD/../include/dpdfglobal.h \
-     $$PWD/../include/dpdfdoc.h \
diff --git a/pkgs/desktops/gnome/extensions/icon-hider/default.nix b/pkgs/desktops/gnome/extensions/icon-hider/default.nix
index 28ad5f1d32a1b..f93c96f30191f 100644
--- a/pkgs/desktops/gnome/extensions/icon-hider/default.nix
+++ b/pkgs/desktops/gnome/extensions/icon-hider/default.nix
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
   meta = with lib; {
     description = "Icon Hider is a GNOME Shell extension for managing status area items";
     license = licenses.bsd3;
-    maintainers = with maintainers; [ jonafato ];
+    maintainers = with maintainers; [ ];
     platforms = gnome-shell.meta.platforms;
     homepage = "https://github.com/ikalnytskyi/gnome-shell-extension-icon-hider";
     broken = versionAtLeast gnome-shell.version "3.32"; # Doesn't support 3.34
diff --git a/pkgs/desktops/gnome/extensions/no-title-bar/default.nix b/pkgs/desktops/gnome/extensions/no-title-bar/default.nix
index 8f6a49fa86898..6e4530817f909 100644
--- a/pkgs/desktops/gnome/extensions/no-title-bar/default.nix
+++ b/pkgs/desktops/gnome/extensions/no-title-bar/default.nix
@@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
     description = "Integrates maximized windows with the top panel";
     homepage = "https://github.com/poehlerj/no-title-bar";
     license = licenses.gpl2;
-    maintainers = with maintainers; [ jonafato svsdep ];
+    maintainers = with maintainers; [ svsdep ];
     platforms = platforms.linux;
   };
 }
diff --git a/pkgs/desktops/gnome/extensions/taskwhisperer/default.nix b/pkgs/desktops/gnome/extensions/taskwhisperer/default.nix
index cf96cdfc6723e..f4e50f46bb257 100644
--- a/pkgs/desktops/gnome/extensions/taskwhisperer/default.nix
+++ b/pkgs/desktops/gnome/extensions/taskwhisperer/default.nix
@@ -39,7 +39,7 @@ stdenv.mkDerivation rec {
   meta = with lib; {
     description = "GNOME Shell TaskWarrior GUI";
     license = licenses.gpl3Plus;
-    maintainers = with maintainers; [ jonafato ];
+    maintainers = with maintainers; [ ];
     homepage = "https://github.com/cinatic/taskwhisperer";
   };
 }