diff options
| author | Thomas Tuegel <ttuegel@mailbox.org> | 2019-07-05 14:38:10 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-07-05 14:38:10 -0500 |
| commit | 56d5963382da1b4848615aa9139e527978c64670 (patch) | |
| tree | 6e76232d7b4fd5cf3034eef18f0e109f2b86bbb0 /pkgs/applications/graphics | |
| parent | 066491c2e18d6277e0765a3647068c93650fcd19 (diff) | |
| parent | 3adc9d04870605ca20969a98fe820535fc7a88a5 (diff) | |
| download | nixlib-56d5963382da1b4848615aa9139e527978c64670.tar nixlib-56d5963382da1b4848615aa9139e527978c64670.tar.gz nixlib-56d5963382da1b4848615aa9139e527978c64670.tar.bz2 nixlib-56d5963382da1b4848615aa9139e527978c64670.tar.lz nixlib-56d5963382da1b4848615aa9139e527978c64670.tar.xz nixlib-56d5963382da1b4848615aa9139e527978c64670.tar.zst nixlib-56d5963382da1b4848615aa9139e527978c64670.zip | |
Merge pull request #54525 from ttuegel/feature/qt-5/wrap-qt-apps
Wrap Qt applications
Diffstat (limited to 'pkgs/applications/graphics')
| -rw-r--r-- | pkgs/applications/graphics/ktikz/default.nix | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/pkgs/applications/graphics/ktikz/default.nix b/pkgs/applications/graphics/ktikz/default.nix index c53c70888b2c..4ddc2074f2f4 100644 --- a/pkgs/applications/graphics/ktikz/default.nix +++ b/pkgs/applications/graphics/ktikz/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, fetchpatch -, pkgconfig, makeWrapper +, pkgconfig, wrapQtAppsHook , poppler, qt5, gnuplot }: @@ -36,9 +36,9 @@ stdenv.mkDerivation rec { }) ]; + nativeBuildInputs = [ pkgconfig qt5.qttools qt5.qmake wrapQtAppsHook ]; QT_PLUGIN_PATH = "${qt5.qtbase}/${qt5.qtbase.qtPluginPrefix}"; - nativeBuildInputs = [ pkgconfig qt5.qttools qt5.qmake makeWrapper ]; buildInputs = [ qt5.qtbase poppler ]; enableParallelBuilding = true; @@ -50,9 +50,5 @@ stdenv.mkDerivation rec { "QCOLLECTIONGENERATORCOMMAND=qhelpgenerator" ]; - postFixup = '' - wrapProgram "$out/bin/qtikz" \ - --prefix QT_PLUGIN_PATH : "${qt5.qtbase}/${qt5.qtbase.qtPluginPrefix}" \ - --prefix PATH : "${gnuplot}/bin" - ''; + qtWrapperArgs = [ ''--prefix PATH : "${gnuplot}/bin"'' ]; } |