diff options
author | José Romildo Malaquias <malaquias@gmail.com> | 2018-09-02 15:15:01 -0300 |
---|---|---|
committer | José Romildo Malaquias <malaquias@gmail.com> | 2018-09-02 15:20:55 -0300 |
commit | c48a234ab1b826c7712b59a10dc541c83b76b5ee (patch) | |
tree | 152bfe4732be4699fee3c5be248dc987c1c4ca9a /pkgs/desktops/deepin | |
parent | ca47cc90c2d5502afddfb575c01d17aff13373b8 (diff) | |
download | nixlib-c48a234ab1b826c7712b59a10dc541c83b76b5ee.tar nixlib-c48a234ab1b826c7712b59a10dc541c83b76b5ee.tar.gz nixlib-c48a234ab1b826c7712b59a10dc541c83b76b5ee.tar.bz2 nixlib-c48a234ab1b826c7712b59a10dc541c83b76b5ee.tar.lz nixlib-c48a234ab1b826c7712b59a10dc541c83b76b5ee.tar.xz nixlib-c48a234ab1b826c7712b59a10dc541c83b76b5ee.tar.zst nixlib-c48a234ab1b826c7712b59a10dc541c83b76b5ee.zip |
dtkcore: only define QT_HOST_DATA if it is empty, enable parallel building
Diffstat (limited to 'pkgs/desktops/deepin')
-rw-r--r-- | pkgs/desktops/deepin/dtkcore/default.nix | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/pkgs/desktops/deepin/dtkcore/default.nix b/pkgs/desktops/deepin/dtkcore/default.nix index 561e951f34d9..1dfb627c605d 100644 --- a/pkgs/desktops/deepin/dtkcore/default.nix +++ b/pkgs/desktops/deepin/dtkcore/default.nix @@ -23,11 +23,16 @@ stdenv.mkDerivation rec { ]; postPatch = '' - sed -i src/src.pro src/dtk_module.prf \ - -e "s,\$\''${QT_HOST_DATA}/mkspecs,$out/mkspecs," + # Only define QT_HOST_DATA if it is empty + sed '/QT_HOST_DATA=/a }' -i src/dtk_module.prf + sed '/QT_HOST_DATA=/i isEmpty(QT_HOST_DATA) {' -i src/dtk_module.prf - sed -i tools/script/dtk-translate.py \ - -e "s,#!env,#!/usr/bin/env," + # Fix shebang + sed -i tools/script/dtk-translate.py -e "s,#!env,#!/usr/bin/env," + ''; + + preConfigure = '' + qmakeFlags="$qmakeFlags QT_HOST_DATA=$out" ''; postFixup = '' @@ -35,6 +40,8 @@ stdenv.mkDerivation rec { wrapPythonProgramsIn "$out/lib/dtk2" "$out $pythonPath" ''; + enableParallelBuilding = true; + meta = with stdenv.lib; { description = "Deepin tool kit core modules"; homepage = https://github.com/linuxdeepin/dtkcore; |