From a100a7891d1c2d1a232aef2d745f6b7a5f8af5b5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Tue, 26 May 2020 16:17:20 -0300 Subject: [PATCH 1/3] deepin.qt5dxcb-plugin: 5.0.1 -> 5.0.11 --- pkgs/desktops/deepin/qt5dxcb-plugin/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/deepin/qt5dxcb-plugin/default.nix b/pkgs/desktops/deepin/qt5dxcb-plugin/default.nix index 4aa10fb1a93b..f91e584bfb6a 100644 --- a/pkgs/desktops/deepin/qt5dxcb-plugin/default.nix +++ b/pkgs/desktops/deepin/qt5dxcb-plugin/default.nix @@ -13,14 +13,14 @@ mkDerivation rec { pname = "qt5dxcb-plugin"; - version = "5.0.1"; + version = "5.0.11"; srcs = [ (fetchFromGitHub { owner = "linuxdeepin"; repo = pname; rev = version; - sha256 = "1pkhbx4hzjv7n4mscv7dng9ymjcc1csdc82iy62yxshhq32bcfja"; + sha256 = "14xkr3p49716jc9v7ksj6jgcmfa65qicqrmablizfi71srg3z2pr"; }) qtbase.src ]; From 0ffc329fcceed9fa68173420607dbc408b8ad591 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Tue, 26 May 2020 16:18:31 -0300 Subject: [PATCH 2/3] deepin.qt5dxcb-plugin: qmake already enables parallel building --- pkgs/desktops/deepin/qt5dxcb-plugin/default.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/desktops/deepin/qt5dxcb-plugin/default.nix b/pkgs/desktops/deepin/qt5dxcb-plugin/default.nix index f91e584bfb6a..802c6a5b4e86 100644 --- a/pkgs/desktops/deepin/qt5dxcb-plugin/default.nix +++ b/pkgs/desktops/deepin/qt5dxcb-plugin/default.nix @@ -51,8 +51,6 @@ mkDerivation rec { "INSTALL_PATH=${placeholder "out"}/${qtbase.qtPluginPrefix}/platforms" ]; - enableParallelBuilding = true; - passthru.updateScript = deepin.updateScript { inherit pname version; src = (builtins.head srcs); }; meta = with stdenv.lib; { From f71e8c90c8b2cd78c4d0bc6140bb56260981dde0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Tue, 26 May 2020 16:28:49 -0300 Subject: [PATCH 3/3] deepin.qt5dxcb-plugin: rename to qt5platform-plugins It has been renamed upstream. --- pkgs/desktops/deepin/default.nix | 2 +- pkgs/desktops/deepin/qt5integration/default.nix | 4 ++-- .../{qt5dxcb-plugin => qt5platform-plugins}/default.nix | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) rename pkgs/desktops/deepin/{qt5dxcb-plugin => qt5platform-plugins}/default.nix (92%) diff --git a/pkgs/desktops/deepin/default.nix b/pkgs/desktops/deepin/default.nix index 8d33ac154afa..6e7dab2d22c4 100644 --- a/pkgs/desktops/deepin/default.nix +++ b/pkgs/desktops/deepin/default.nix @@ -54,8 +54,8 @@ let go-gir-generator = callPackage ./go-gir-generator { }; go-lib = callPackage ./go-lib { }; qcef = callPackage ./qcef { }; - qt5dxcb-plugin = callPackage ./qt5dxcb-plugin { }; qt5integration = callPackage ./qt5integration { }; + qt5platform-plugins = callPackage ./qt5platform-plugins { }; startdde = callPackage ./startdde { }; udisks2-qt5 = callPackage ./udisks2-qt5 { }; diff --git a/pkgs/desktops/deepin/qt5integration/default.nix b/pkgs/desktops/deepin/qt5integration/default.nix index cc427611c34a..e3bbaba068bd 100644 --- a/pkgs/desktops/deepin/qt5integration/default.nix +++ b/pkgs/desktops/deepin/qt5integration/default.nix @@ -8,7 +8,7 @@ , qtx11extras , qtmultimedia , qtsvg -, qt5dxcb-plugin +, qt5platform-plugins , qtstyleplugins , dtkcore , dtkwidget @@ -34,7 +34,7 @@ mkDerivation rec { buildInputs = [ dtkcore dtkwidget - qt5dxcb-plugin + qt5platform-plugins mtdev lxqt.libqtxdg qtstyleplugins diff --git a/pkgs/desktops/deepin/qt5dxcb-plugin/default.nix b/pkgs/desktops/deepin/qt5platform-plugins/default.nix similarity index 92% rename from pkgs/desktops/deepin/qt5dxcb-plugin/default.nix rename to pkgs/desktops/deepin/qt5platform-plugins/default.nix index 802c6a5b4e86..33e4863c0d94 100644 --- a/pkgs/desktops/deepin/qt5dxcb-plugin/default.nix +++ b/pkgs/desktops/deepin/qt5platform-plugins/default.nix @@ -12,7 +12,7 @@ }: mkDerivation rec { - pname = "qt5dxcb-plugin"; + pname = "qt5platform-plugins"; version = "5.0.11"; srcs = [ @@ -55,7 +55,7 @@ mkDerivation rec { meta = with stdenv.lib; { description = "Qt platform theme integration plugin for DDE"; - homepage = "https://github.com/linuxdeepin/qt5dxcb-plugin"; + homepage = "https://github.com/linuxdeepin/qt5platform-plugins"; license = licenses.gpl3; platforms = platforms.linux; maintainers = with maintainers; [ romildo ];