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/qt5dxcb-plugin/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/qt5dxcb-plugin/default.nix')
| -rw-r--r-- | pkgs/desktops/deepin/qt5dxcb-plugin/default.nix | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/pkgs/desktops/deepin/qt5dxcb-plugin/default.nix b/pkgs/desktops/deepin/qt5dxcb-plugin/default.nix index 2e6ddfcdb2dd..f2e6eb0d1233 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, - mtdev, cairo, deepin }: +{ stdenv, mkDerivation, fetchFromGitHub, pkgconfig, qmake, qtx11extras, libSM, + mtdev, cairo, deepin, qtbase }: -stdenv.mkDerivation rec { +mkDerivation rec { name = "${pname}-${version}"; pname = "qt5dxcb-plugin"; version = "1.2.2"; @@ -25,9 +25,9 @@ stdenv.mkDerivation rec { cairo ]; - preConfigure = '' - qmakeFlags="$qmakeFlags INSTALL_PATH=$out/$qtPluginPrefix/platforms" - ''; + qmakeFlags = [ + "INSTALL_PATH=${placeholder ''out''}/${qtbase.qtPluginPrefix}/platforms" + ]; enableParallelBuilding = true; |