diff options
| author | worldofpeace <worldofpeace@protonmail.ch> | 2019-08-04 10:24:09 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-08-04 10:24:09 -0400 |
| commit | c0a57b7854bb912126f05b9747c5e8edd0d255c5 (patch) | |
| tree | 810088de2cfba89fec3f13429c22b6a012d9c08e /pkgs/desktops/deepin/dtkwidget/default.nix | |
| parent | c58defaff1b705a2f2940db1da2165774fb8d8af (diff) | |
| parent | d01d0c1a8175c99b3322bd0c34d981900443eb37 (diff) | |
| download | nixlib-c0a57b7854bb912126f05b9747c5e8edd0d255c5.tar nixlib-c0a57b7854bb912126f05b9747c5e8edd0d255c5.tar.gz nixlib-c0a57b7854bb912126f05b9747c5e8edd0d255c5.tar.bz2 nixlib-c0a57b7854bb912126f05b9747c5e8edd0d255c5.tar.lz nixlib-c0a57b7854bb912126f05b9747c5e8edd0d255c5.tar.xz nixlib-c0a57b7854bb912126f05b9747c5e8edd0d255c5.tar.zst nixlib-c0a57b7854bb912126f05b9747c5e8edd0d255c5.zip | |
Merge pull request #65248 from worldofpeace/mkDerivation/deepin
deepin: use qt5.mkDerivation where needed, cleanup wrappers
Diffstat (limited to 'pkgs/desktops/deepin/dtkwidget/default.nix')
| -rw-r--r-- | pkgs/desktops/deepin/dtkwidget/default.nix | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/pkgs/desktops/deepin/dtkwidget/default.nix b/pkgs/desktops/deepin/dtkwidget/default.nix index 4992519f8326..8487509e73b2 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"; @@ -31,12 +31,13 @@ stdenv.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; |