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/dde-session-ui | |
| parent | 2b350d16efab2dd2acc40dd6f1b2da7c390c199f (diff) | |
| download | nixlib-735199a2104bc52b09f0193bdce7b1d95e4c7288.tar nixlib-735199a2104bc52b09f0193bdce7b1d95e4c7288.tar.gz nixlib-735199a2104bc52b09f0193bdce7b1d95e4c7288.tar.bz2 nixlib-735199a2104bc52b09f0193bdce7b1d95e4c7288.tar.lz nixlib-735199a2104bc52b09f0193bdce7b1d95e4c7288.tar.xz nixlib-735199a2104bc52b09f0193bdce7b1d95e4c7288.tar.zst nixlib-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/dde-session-ui')
| -rw-r--r-- | pkgs/desktops/deepin/dde-session-ui/default.nix | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/desktops/deepin/dde-session-ui/default.nix b/pkgs/desktops/deepin/dde-session-ui/default.nix index 0c00627cd4fb..8302e8e97bcd 100644 --- a/pkgs/desktops/deepin/dde-session-ui/default.nix +++ b/pkgs/desktops/deepin/dde-session-ui/default.nix @@ -1,11 +1,11 @@ -{ stdenv, fetchFromGitHub, pkgconfig, qmake, dbus, dde-daemon, +{ stdenv, mkDerivation, fetchFromGitHub, pkgconfig, qmake, dbus, dde-daemon, dde-qt-dbus-factory, deepin, deepin-desktop-schemas, deepin-gettext-tools, deepin-icon-theme, deepin-wallpapers, dtkcore, dtkwidget, gnugrep, gsettings-qt, hicolor-icon-theme, lightdm_qt, onboard, qtsvg, qttools, qtx11extras, setxkbmap, utillinux, which, xkeyboard_config, xorg, xrandr, wrapGAppsHook }: -stdenv.mkDerivation rec { +mkDerivation rec { name = "${pname}-${version}"; pname = "dde-session-ui"; version = "4.9.12"; @@ -109,7 +109,7 @@ stdenv.mkDerivation rec { postFixup = '' # wrapGAppsHook does not work with binaries outside of $out/bin or $out/libexec for binary in $out/lib/deepin-daemon/*; do - wrapProgram $binary "''${gappsWrapperArgs[@]}" + wrapProgram $binary "''${qtWrapperArgs[@]}" done searchHardCodedPaths $out # debugging |