diff options
author | worldofpeace <worldofpeace@protonmail.ch> | 2019-07-21 22:53:18 -0400 |
---|---|---|
committer | worldofpeace <worldofpeace@protonmail.ch> | 2019-07-21 23:49:36 -0400 |
commit | 735199a2104bc52b09f0193bdce7b1d95e4c7288 (patch) | |
tree | f1d7ac37a03651571233559689770500bdadcf0c /pkgs/desktops/deepin/qt5integration/default.nix | |
parent | 2b350d16efab2dd2acc40dd6f1b2da7c390c199f (diff) | |
download | nixpkgs-735199a2104bc52b09f0193bdce7b1d95e4c7288.tar nixpkgs-735199a2104bc52b09f0193bdce7b1d95e4c7288.tar.gz nixpkgs-735199a2104bc52b09f0193bdce7b1d95e4c7288.tar.bz2 nixpkgs-735199a2104bc52b09f0193bdce7b1d95e4c7288.tar.lz nixpkgs-735199a2104bc52b09f0193bdce7b1d95e4c7288.tar.xz nixpkgs-735199a2104bc52b09f0193bdce7b1d95e4c7288.tar.zst nixpkgs-735199a2104bc52b09f0193bdce7b1d95e4c7288.zip |
deepin: use qt5.mkDerivation where needed, cleanup wrappers
This switches a majority of the applications to using qt5.mkDerivation which automatically adds wrapQtAppsHook. In certain places, where GLib and gtk intersect with Qt, we also needed to use wrapGAppsHook. In these cases there will be multiple wrappers.
Diffstat (limited to 'pkgs/desktops/deepin/qt5integration/default.nix')
-rw-r--r-- | pkgs/desktops/deepin/qt5integration/default.nix | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/desktops/deepin/qt5integration/default.nix b/pkgs/desktops/deepin/qt5integration/default.nix index 7df1fdf3165..8302e701b38 100644 --- a/pkgs/desktops/deepin/qt5integration/default.nix +++ b/pkgs/desktops/deepin/qt5integration/default.nix @@ -1,8 +1,8 @@ -{ stdenv, fetchFromGitHub, pkgconfig, qmake, mtdev , - lxqt, qtx11extras, qtmultimedia, qtsvg , +{ stdenv, mkDerivation, fetchFromGitHub, pkgconfig, qmake, mtdev, + lxqt, qtx11extras, qtmultimedia, qtsvg, qt5dxcb-plugin, qtstyleplugins, dtkcore, dtkwidget, deepin }: -stdenv.mkDerivation rec { +mkDerivation rec { name = "${pname}-${version}"; pname = "qt5integration"; version = "0.3.12"; |