From 735199a2104bc52b09f0193bdce7b1d95e4c7288 Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Sun, 21 Jul 2019 22:53:18 -0400 Subject: 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. --- pkgs/desktops/deepin/dde-calendar/default.nix | 4 ++-- pkgs/desktops/deepin/dde-control-center/default.nix | 6 +++--- pkgs/desktops/deepin/dde-dock/default.nix | 10 +++++----- pkgs/desktops/deepin/dde-file-manager/default.nix | 4 ++-- pkgs/desktops/deepin/dde-launcher/default.nix | 4 ++-- pkgs/desktops/deepin/dde-network-utils/default.nix | 4 ++-- pkgs/desktops/deepin/dde-polkit-agent/default.nix | 4 ++-- pkgs/desktops/deepin/dde-session-ui/default.nix | 6 +++--- pkgs/desktops/deepin/deepin-anything/default.nix | 4 ++-- pkgs/desktops/deepin/deepin-calculator/default.nix | 6 +++--- pkgs/desktops/deepin/deepin-image-viewer/default.nix | 4 ++-- pkgs/desktops/deepin/deepin-menu/default.nix | 4 ++-- pkgs/desktops/deepin/deepin-metacity/default.nix | 3 ++- pkgs/desktops/deepin/deepin-movie-reborn/default.nix | 4 ++-- pkgs/desktops/deepin/deepin-screenshot/default.nix | 4 ++-- pkgs/desktops/deepin/deepin-shortcut-viewer/default.nix | 4 ++-- pkgs/desktops/deepin/deepin-terminal/default.nix | 3 ++- pkgs/desktops/deepin/deepin-turbo/default.nix | 4 ++-- pkgs/desktops/deepin/dtkcore/default.nix | 4 ++-- pkgs/desktops/deepin/dtkwidget/default.nix | 4 ++-- pkgs/desktops/deepin/dtkwm/default.nix | 4 ++-- pkgs/desktops/deepin/qcef/default.nix | 4 ++-- pkgs/desktops/deepin/qt5dxcb-plugin/default.nix | 4 ++-- pkgs/desktops/deepin/qt5integration/default.nix | 6 +++--- pkgs/desktops/deepin/udisks2-qt5/default.nix | 4 ++-- 25 files changed, 57 insertions(+), 55 deletions(-) (limited to 'pkgs/desktops') diff --git a/pkgs/desktops/deepin/dde-calendar/default.nix b/pkgs/desktops/deepin/dde-calendar/default.nix index 16c8002b8e48..0d25d9083ebb 100644 --- a/pkgs/desktops/deepin/dde-calendar/default.nix +++ b/pkgs/desktops/deepin/dde-calendar/default.nix @@ -1,8 +1,8 @@ -{ stdenv, fetchFromGitHub, pkgconfig, cmake, qttools, +{ stdenv, mkDerivation, fetchFromGitHub, pkgconfig, cmake, qttools, deepin-gettext-tools, dtkcore, dtkwidget, deepin }: -stdenv.mkDerivation rec { +mkDerivation rec { name = "${pname}-${version}"; pname = "dde-calendar"; version = "1.2.10"; diff --git a/pkgs/desktops/deepin/dde-control-center/default.nix b/pkgs/desktops/deepin/dde-control-center/default.nix index 906812cf98b4..88c3639ff2e6 100644 --- a/pkgs/desktops/deepin/dde-control-center/default.nix +++ b/pkgs/desktops/deepin/dde-control-center/default.nix @@ -1,12 +1,12 @@ -{ stdenv, fetchFromGitHub, pkgconfig, cmake, deepin, qttools, qtdeclarative, +{ stdenv, mkDerivation, fetchFromGitHub, pkgconfig, cmake, deepin, qttools, qtdeclarative, networkmanager, qtsvg, qtx11extras, dtkcore, dtkwidget, geoip, gsettings-qt, dde-network-utils, networkmanager-qt, xorg, mtdev, fontconfig, freetype, dde-api, dde-daemon, qt5integration, deepin-desktop-base, deepin-desktop-schemas, dbus, systemd, dde-qt-dbus-factory, qtmultimedia, qtbase, glib, gnome3, which, - substituteAll, wrapGAppsHook, tzdata + substituteAll, tzdata, wrapGAppsHook }: -stdenv.mkDerivation rec { +mkDerivation rec { name = "${pname}-${version}"; pname = "dde-control-center"; version = "4.10.11"; diff --git a/pkgs/desktops/deepin/dde-dock/default.nix b/pkgs/desktops/deepin/dde-dock/default.nix index e143f783a5a4..21c8221bd13b 100644 --- a/pkgs/desktops/deepin/dde-dock/default.nix +++ b/pkgs/desktops/deepin/dde-dock/default.nix @@ -1,11 +1,11 @@ -{ stdenv, fetchFromGitHub, cmake, pkgconfig, qttools, qtx11extras, - qtsvg, libsForQt5, polkit, gsettings-qt, dtkcore, dtkwidget, +{ stdenv, mkDerivation, fetchFromGitHub, cmake, pkgconfig, qttools, qtx11extras, + qtsvg, polkit, gsettings-qt, dtkcore, dtkwidget, dde-qt-dbus-factory, dde-network-utils, dde-daemon, deepin-desktop-schemas, xorg, glib, wrapGAppsHook, deepin, - plugins ? [], symlinkJoin, makeWrapper }: + plugins ? [], symlinkJoin, makeWrapper, libdbusmenu }: let -unwrapped = stdenv.mkDerivation rec { +unwrapped = mkDerivation rec { name = "${pname}-${version}"; pname = "dde-dock"; version = "4.10.3"; @@ -34,7 +34,7 @@ unwrapped = stdenv.mkDerivation rec { dtkwidget glib.bin gsettings-qt - libsForQt5.libdbusmenu + libdbusmenu polkit qtsvg qtx11extras diff --git a/pkgs/desktops/deepin/dde-file-manager/default.nix b/pkgs/desktops/deepin/dde-file-manager/default.nix index c203ccae6fba..3580eeb43045 100644 --- a/pkgs/desktops/deepin/dde-file-manager/default.nix +++ b/pkgs/desktops/deepin/dde-file-manager/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, pkgconfig, avfs, dde-daemon, dde-dock, +{ stdenv, mkDerivation, fetchFromGitHub, pkgconfig, avfs, dde-daemon, dde-dock, dde-polkit-agent, dde-qt-dbus-factory, deepin, deepin-anything, deepin-desktop-schemas, deepin-gettext-tools, deepin-movie-reborn, deepin-shortcut-viewer, deepin-terminal, dtkcore, dtkwidget, @@ -8,7 +8,7 @@ qtx11extras, runtimeShell, samba, shadow, taglib, udisks2-qt5, xdg-user-dirs, xorg, zlib, wrapGAppsHook }: -stdenv.mkDerivation rec { +mkDerivation rec { name = "${pname}-${version}"; pname = "dde-file-manager"; version = "4.8.6.4"; diff --git a/pkgs/desktops/deepin/dde-launcher/default.nix b/pkgs/desktops/deepin/dde-launcher/default.nix index 2710393a257c..f8a05b869802 100644 --- a/pkgs/desktops/deepin/dde-launcher/default.nix +++ b/pkgs/desktops/deepin/dde-launcher/default.nix @@ -1,9 +1,9 @@ -{ stdenv, fetchFromGitHub, pkgconfig, cmake, dde-qt-dbus-factory, +{ stdenv, mkDerivation, fetchFromGitHub, pkgconfig, cmake, dde-qt-dbus-factory, dde-session-ui, deepin, deepin-desktop-schemas, deepin-wallpapers, dtkcore, dtkwidget, gsettings-qt, qtsvg, qttools, qtx11extras, which, xdg_utils, wrapGAppsHook }: -stdenv.mkDerivation rec { +mkDerivation rec { name = "${pname}-${version}"; pname = "dde-launcher"; version = "4.6.13"; diff --git a/pkgs/desktops/deepin/dde-network-utils/default.nix b/pkgs/desktops/deepin/dde-network-utils/default.nix index 84c7c9207eca..4fd08749ee49 100644 --- a/pkgs/desktops/deepin/dde-network-utils/default.nix +++ b/pkgs/desktops/deepin/dde-network-utils/default.nix @@ -1,7 +1,7 @@ -{ stdenv, fetchFromGitHub, substituteAll, qmake, pkgconfig, qttools, +{ stdenv, mkDerivation, fetchFromGitHub, substituteAll, qmake, pkgconfig, qttools, dde-qt-dbus-factory, proxychains, which, deepin }: -stdenv.mkDerivation rec { +mkDerivation rec { name = "${pname}-${version}"; pname = "dde-network-utils"; version = "0.1.4"; diff --git a/pkgs/desktops/deepin/dde-polkit-agent/default.nix b/pkgs/desktops/deepin/dde-polkit-agent/default.nix index 8e58ae2f684c..d1f1bed2775a 100644 --- a/pkgs/desktops/deepin/dde-polkit-agent/default.nix +++ b/pkgs/desktops/deepin/dde-polkit-agent/default.nix @@ -1,7 +1,7 @@ -{ stdenv, fetchFromGitHub, pkgconfig, qmake, qttools, polkit-qt, +{ stdenv, mkDerivation, fetchFromGitHub, pkgconfig, qmake, qttools, polkit-qt, dtkcore, dtkwidget, dde-qt-dbus-factory, deepin }: -stdenv.mkDerivation rec { +mkDerivation rec { name = "${pname}-${version}"; pname = "dde-polkit-agent"; version = "0.2.10"; 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 diff --git a/pkgs/desktops/deepin/deepin-anything/default.nix b/pkgs/desktops/deepin/deepin-anything/default.nix index a8cce9ba3923..c768fa60ce70 100644 --- a/pkgs/desktops/deepin/deepin-anything/default.nix +++ b/pkgs/desktops/deepin/deepin-anything/default.nix @@ -1,7 +1,7 @@ -{ stdenv, fetchFromGitHub, pkgconfig, qtbase, udisks2-qt5, utillinux, +{ stdenv, mkDerivation, fetchFromGitHub, pkgconfig, qtbase, udisks2-qt5, utillinux, dtkcore, deepin }: -stdenv.mkDerivation rec { +mkDerivation rec { name = "${pname}-${version}"; pname = "deepin-anything"; version = "0.1.0"; diff --git a/pkgs/desktops/deepin/deepin-calculator/default.nix b/pkgs/desktops/deepin/deepin-calculator/default.nix index 5b7ca7566075..51f0b666cb1e 100644 --- a/pkgs/desktops/deepin/deepin-calculator/default.nix +++ b/pkgs/desktops/deepin/deepin-calculator/default.nix @@ -1,7 +1,7 @@ -{ stdenv, fetchFromGitHub, pkgconfig, qmake, qttools, qtsvg, dtkcore, +{ stdenv, mkDerivation, fetchFromGitHub, pkgconfig, qmake, qttools, qtsvg, dtkcore, dtkwidget, deepin }: -stdenv.mkDerivation rec { +mkDerivation rec { name = "${pname}-${version}"; pname = "deepin-calculator"; version = "1.0.11"; @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { postFixup = '' searchHardCodedPaths $out # debugging ''; - + passthru.updateScript = deepin.updateScript { inherit name; }; meta = with stdenv.lib; { diff --git a/pkgs/desktops/deepin/deepin-image-viewer/default.nix b/pkgs/desktops/deepin/deepin-image-viewer/default.nix index 5957478aa480..89ef62475047 100644 --- a/pkgs/desktops/deepin/deepin-image-viewer/default.nix +++ b/pkgs/desktops/deepin/deepin-image-viewer/default.nix @@ -1,9 +1,9 @@ -{ stdenv, fetchFromGitHub, pkgconfig, qmake, qttools, qtsvg, +{ stdenv, mkDerivation, fetchFromGitHub, pkgconfig, qmake, qttools, qtsvg, qtx11extras, dtkcore, dtkwidget, qt5integration, freeimage, libraw, libexif, deepin }: -stdenv.mkDerivation rec { +mkDerivation rec { name = "${pname}-${version}"; pname = "deepin-image-viewer"; version = "1.3.17"; diff --git a/pkgs/desktops/deepin/deepin-menu/default.nix b/pkgs/desktops/deepin/deepin-menu/default.nix index 43a124c07196..4292fb2d212b 100644 --- a/pkgs/desktops/deepin/deepin-menu/default.nix +++ b/pkgs/desktops/deepin/deepin-menu/default.nix @@ -1,7 +1,7 @@ -{ stdenv, fetchFromGitHub, pkgconfig, qmake, dtkcore, dtkwidget, +{ stdenv, mkDerivation, fetchFromGitHub, pkgconfig, qmake, dtkcore, dtkwidget, qt5integration, deepin }: -stdenv.mkDerivation rec { +mkDerivation rec { name = "${pname}-${version}"; pname = "deepin-menu"; version = "3.4.8"; diff --git a/pkgs/desktops/deepin/deepin-metacity/default.nix b/pkgs/desktops/deepin/deepin-metacity/default.nix index fdf2c240e2c8..a4aede5857c9 100644 --- a/pkgs/desktops/deepin/deepin-metacity/default.nix +++ b/pkgs/desktops/deepin/deepin-metacity/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, pkgconfig, intltool, libtool, gnome3, glib, gtk3, libgtop, bamf, json-glib, libcanberra-gtk3, libxkbcommon, libstartup_notification, deepin-wallpapers, deepin-desktop-schemas, - deepin }: + deepin, wrapGAppsHook }: stdenv.mkDerivation rec { name = "${pname}-${version}"; @@ -21,6 +21,7 @@ stdenv.mkDerivation rec { libtool glib.dev gnome3.gnome-common + wrapGAppsHook ]; buildInputs = [ diff --git a/pkgs/desktops/deepin/deepin-movie-reborn/default.nix b/pkgs/desktops/deepin/deepin-movie-reborn/default.nix index cdf3019e5fe1..6e14f0fd804e 100644 --- a/pkgs/desktops/deepin/deepin-movie-reborn/default.nix +++ b/pkgs/desktops/deepin/deepin-movie-reborn/default.nix @@ -1,8 +1,8 @@ -{ stdenv, fetchFromGitHub, cmake, pkgconfig, qttools, qtx11extras, +{ stdenv, mkDerivation, fetchFromGitHub, cmake, pkgconfig, qttools, qtx11extras, dtkcore, dtkwidget, ffmpeg, ffmpegthumbnailer, mpv, pulseaudio, libdvdnav, libdvdread, xorg, deepin }: -stdenv.mkDerivation rec { +mkDerivation rec { name = "${pname}-${version}"; pname = "deepin-movie-reborn"; version = "3.2.24"; diff --git a/pkgs/desktops/deepin/deepin-screenshot/default.nix b/pkgs/desktops/deepin/deepin-screenshot/default.nix index 4096df661909..256744828db8 100644 --- a/pkgs/desktops/deepin/deepin-screenshot/default.nix +++ b/pkgs/desktops/deepin/deepin-screenshot/default.nix @@ -1,8 +1,8 @@ -{ stdenv, fetchFromGitHub, fetchpatch, cmake, pkgconfig, xdg_utils, qttools, qtx11extras, +{ stdenv, mkDerivation, fetchFromGitHub, fetchpatch, cmake, pkgconfig, xdg_utils, qttools, qtx11extras, dtkcore, dtkwidget, dtkwm, deepin-turbo, deepin-shortcut-viewer, deepin }: -stdenv.mkDerivation rec { +mkDerivation rec { name = "${pname}-${version}"; pname = "deepin-screenshot"; version = "4.2.1"; diff --git a/pkgs/desktops/deepin/deepin-shortcut-viewer/default.nix b/pkgs/desktops/deepin/deepin-shortcut-viewer/default.nix index 737c99261f9d..8c482d534052 100644 --- a/pkgs/desktops/deepin/deepin-shortcut-viewer/default.nix +++ b/pkgs/desktops/deepin/deepin-shortcut-viewer/default.nix @@ -1,7 +1,7 @@ -{ stdenv, fetchFromGitHub, pkgconfig, qmake, dtkcore, dtkwidget, +{ stdenv, mkDerivation, fetchFromGitHub, pkgconfig, qmake, dtkcore, dtkwidget, qt5integration, deepin }: -stdenv.mkDerivation rec { +mkDerivation rec { name = "${pname}-${version}"; pname = "deepin-shortcut-viewer"; version = "1.3.5"; diff --git a/pkgs/desktops/deepin/deepin-terminal/default.nix b/pkgs/desktops/deepin/deepin-terminal/default.nix index 937c1f0d2184..51156554f999 100644 --- a/pkgs/desktops/deepin/deepin-terminal/default.nix +++ b/pkgs/desktops/deepin/deepin-terminal/default.nix @@ -2,7 +2,7 @@ gettext, at-spi2-core, dbus, epoxy, expect, gtk3, json-glib, libXdmcp, libgee, libpthreadstubs, librsvg, libsecret, libtasn1, libxcb, libxkbcommon, p11-kit, pcre, vte, wnck, libselinux, - libsepol, utillinux, deepin-menu, deepin-shortcut-viewer, deepin }: + libsepol, utillinux, deepin-menu, deepin-shortcut-viewer, deepin, wrapGAppsHook }: stdenv.mkDerivation rec { name = "${pname}-${version}"; @@ -24,6 +24,7 @@ stdenv.mkDerivation rec { gettext libselinux libsepol utillinux # required by gio deepin.setupHook + wrapGAppsHook ]; buildInputs = [ diff --git a/pkgs/desktops/deepin/deepin-turbo/default.nix b/pkgs/desktops/deepin/deepin-turbo/default.nix index d5702a55d903..1fe930ea490d 100644 --- a/pkgs/desktops/deepin/deepin-turbo/default.nix +++ b/pkgs/desktops/deepin/deepin-turbo/default.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchFromGitHub, cmake, pkgconfig, qtbase, deepin }: +{ stdenv, mkDerivation, fetchFromGitHub, cmake, pkgconfig, qtbase, deepin }: -stdenv.mkDerivation rec { +mkDerivation rec { name = "${pname}-${version}"; pname = "deepin-turbo"; version = "0.0.3"; diff --git a/pkgs/desktops/deepin/dtkcore/default.nix b/pkgs/desktops/deepin/dtkcore/default.nix index a0ed5c04e185..2a527e3cc19c 100644 --- a/pkgs/desktops/deepin/dtkcore/default.nix +++ b/pkgs/desktops/deepin/dtkcore/default.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchFromGitHub, pkgconfig, qmake, gsettings-qt, pythonPackages, deepin }: +{ stdenv, mkDerivation, fetchFromGitHub, pkgconfig, qmake, gsettings-qt, pythonPackages, deepin }: -stdenv.mkDerivation rec { +mkDerivation rec { name = "${pname}-${version}"; pname = "dtkcore"; version = "2.0.14"; diff --git a/pkgs/desktops/deepin/dtkwidget/default.nix b/pkgs/desktops/deepin/dtkwidget/default.nix index 4992519f8326..667d418276ba 100644 --- a/pkgs/desktops/deepin/dtkwidget/default.nix +++ b/pkgs/desktops/deepin/dtkwidget/default.nix @@ -1,8 +1,8 @@ -{ stdenv, fetchFromGitHub, pkgconfig, qmake, qttools, qtmultimedia, +{ stdenv, mkDerivation, fetchFromGitHub, pkgconfig, qmake, qttools, qtmultimedia, qtsvg, qtx11extras, librsvg, libstartup_notification, gsettings-qt, dde-qt-dbus-factory, dtkcore, deepin }: -stdenv.mkDerivation rec { +mkDerivation rec { name = "${pname}-${version}"; pname = "dtkwidget"; version = "2.0.14"; diff --git a/pkgs/desktops/deepin/dtkwm/default.nix b/pkgs/desktops/deepin/dtkwm/default.nix index c0834ace8f8c..bc51c3dd7b48 100644 --- a/pkgs/desktops/deepin/dtkwm/default.nix +++ b/pkgs/desktops/deepin/dtkwm/default.nix @@ -1,7 +1,7 @@ -{ stdenv, fetchFromGitHub, pkgconfig, qmake, qtx11extras, dtkcore, +{ stdenv, mkDerivation, fetchFromGitHub, pkgconfig, qmake, qtx11extras, dtkcore, deepin }: -stdenv.mkDerivation rec { +mkDerivation rec { name = "${pname}-${version}"; pname = "dtkwm"; version = "2.0.11"; diff --git a/pkgs/desktops/deepin/qcef/default.nix b/pkgs/desktops/deepin/qcef/default.nix index 8e75917907ac..9f37a9bbeaef 100644 --- a/pkgs/desktops/deepin/qcef/default.nix +++ b/pkgs/desktops/deepin/qcef/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, pkgconfig, cmake, qtbase, qttools, +{ stdenv, mkDerivation, fetchFromGitHub, pkgconfig, cmake, qtbase, qttools, qtwebchannel, qtx11extras, gnome2, nss, nspr, alsaLib, atk, cairo, cups, dbus, expat, fontconfig, gdk_pixbuf, glib, gtk2, @@ -38,7 +38,7 @@ let libPath = stdenv.lib.makeLibraryPath rpahtLibraries; in -stdenv.mkDerivation rec { +mkDerivation rec { name = "${pname}-${version}"; pname = "qcef"; version = "1.1.6"; diff --git a/pkgs/desktops/deepin/qt5dxcb-plugin/default.nix b/pkgs/desktops/deepin/qt5dxcb-plugin/default.nix index 2e6ddfcdb2dd..8c176ea2ecb8 100644 --- a/pkgs/desktops/deepin/qt5dxcb-plugin/default.nix +++ b/pkgs/desktops/deepin/qt5dxcb-plugin/default.nix @@ -1,7 +1,7 @@ -{ stdenv, fetchFromGitHub, pkgconfig, qmake, qtx11extras, libSM, +{ stdenv, mkDerivation, fetchFromGitHub, pkgconfig, qmake, qtx11extras, libSM, mtdev, cairo, deepin }: -stdenv.mkDerivation rec { +mkDerivation rec { name = "${pname}-${version}"; pname = "qt5dxcb-plugin"; version = "1.2.2"; diff --git a/pkgs/desktops/deepin/qt5integration/default.nix b/pkgs/desktops/deepin/qt5integration/default.nix index 7df1fdf3165a..8302e701b386 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"; diff --git a/pkgs/desktops/deepin/udisks2-qt5/default.nix b/pkgs/desktops/deepin/udisks2-qt5/default.nix index b0f5aaee97c0..e7f735a4256a 100644 --- a/pkgs/desktops/deepin/udisks2-qt5/default.nix +++ b/pkgs/desktops/deepin/udisks2-qt5/default.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchFromGitHub, qmake, qtbase, deepin }: +{ stdenv, mkDerivation, fetchFromGitHub, qmake, qtbase, deepin }: -stdenv.mkDerivation rec { +mkDerivation rec { name = "${pname}-${version}"; pname = "udisks2-qt5"; version = "0.0.1"; -- cgit 1.4.1 From 0f73418f432d728382ab03941f8b5b71b2b43653 Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Sun, 21 Jul 2019 23:23:25 -0400 Subject: deepin.qt5dxcb-plugin: use qmakeFlags --- pkgs/desktops/deepin/qt5dxcb-plugin/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'pkgs/desktops') diff --git a/pkgs/desktops/deepin/qt5dxcb-plugin/default.nix b/pkgs/desktops/deepin/qt5dxcb-plugin/default.nix index 8c176ea2ecb8..f2e6eb0d1233 100644 --- a/pkgs/desktops/deepin/qt5dxcb-plugin/default.nix +++ b/pkgs/desktops/deepin/qt5dxcb-plugin/default.nix @@ -1,5 +1,5 @@ { stdenv, mkDerivation, fetchFromGitHub, pkgconfig, qmake, qtx11extras, libSM, - mtdev, cairo, deepin }: + mtdev, cairo, deepin, qtbase }: mkDerivation rec { name = "${pname}-${version}"; @@ -25,9 +25,9 @@ mkDerivation rec { cairo ]; - preConfigure = '' - qmakeFlags="$qmakeFlags INSTALL_PATH=$out/$qtPluginPrefix/platforms" - ''; + qmakeFlags = [ + "INSTALL_PATH=${placeholder ''out''}/${qtbase.qtPluginPrefix}/platforms" + ]; enableParallelBuilding = true; -- cgit 1.4.1 From 98656c95d8bd70afbfba726dbbd6b9831d874070 Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Sun, 21 Jul 2019 23:26:05 -0400 Subject: deepin.dtkwm: use qmakeFlags --- pkgs/desktops/deepin/dtkwm/default.nix | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) (limited to 'pkgs/desktops') diff --git a/pkgs/desktops/deepin/dtkwm/default.nix b/pkgs/desktops/deepin/dtkwm/default.nix index bc51c3dd7b48..c05eedd8857a 100644 --- a/pkgs/desktops/deepin/dtkwm/default.nix +++ b/pkgs/desktops/deepin/dtkwm/default.nix @@ -23,12 +23,13 @@ mkDerivation rec { qtx11extras ]; - preConfigure = '' - qmakeFlags="$qmakeFlags \ - QT_HOST_DATA=$out \ - INCLUDE_INSTALL_DIR=$out/include \ - LIB_INSTALL_DIR=$out/lib" - ''; + outRef = placeholder "out"; + + qmakeFlags = [ + "QT_HOST_DATA=${outRef}" + "INCLUDE_INSTALL_DIR=${outRef}/include" + "LIB_INSTALL_DIR=${outRef}/lib" + ]; passthru.updateScript = deepin.updateScript { inherit name; }; -- cgit 1.4.1 From d01d0c1a8175c99b3322bd0c34d981900443eb37 Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Sun, 21 Jul 2019 23:30:24 -0400 Subject: deepin.dtkwidget: use qmakeFlags --- pkgs/desktops/deepin/dtkwidget/default.nix | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) (limited to 'pkgs/desktops') diff --git a/pkgs/desktops/deepin/dtkwidget/default.nix b/pkgs/desktops/deepin/dtkwidget/default.nix index 667d418276ba..8487509e73b2 100644 --- a/pkgs/desktops/deepin/dtkwidget/default.nix +++ b/pkgs/desktops/deepin/dtkwidget/default.nix @@ -31,12 +31,13 @@ mkDerivation rec { dtkcore ]; - preConfigure = '' - qmakeFlags="$qmakeFlags \ - INCLUDE_INSTALL_DIR=$out/include \ - LIB_INSTALL_DIR=$out/lib \ - QT_HOST_DATA=$out" - ''; + outRef = placeholder "out"; + + qmakeFlags = [ + "INCLUDE_INSTALL_DIR=${outRef}/include" + "LIB_INSTALL_DIR=${outRef}/lib" + "QT_HOST_DATA=${outRef}" + ]; enableParallelBuilding = true; -- cgit 1.4.1