diff options
author | Alyssa Ross <hi@alyssa.is> | 2019-08-14 00:20:49 +0000 |
---|---|---|
committer | Alyssa Ross <hi@alyssa.is> | 2019-08-14 00:23:16 +0000 |
commit | 4999a38db7c5de0ea9f514a12ecd4133cce647f3 (patch) | |
tree | bbb659ab07fda4c9b98053499b7e3f046ac6d5dc /nixpkgs/pkgs/applications/graphics/ktikz/default.nix | |
parent | f9abd30e11337cf07034f2cc8ad1691aa4a69386 (diff) | |
parent | 8746c77a383f5c76153c7a181f3616d273acfa2a (diff) | |
download | nixlib-4999a38db7c5de0ea9f514a12ecd4133cce647f3.tar nixlib-4999a38db7c5de0ea9f514a12ecd4133cce647f3.tar.gz nixlib-4999a38db7c5de0ea9f514a12ecd4133cce647f3.tar.bz2 nixlib-4999a38db7c5de0ea9f514a12ecd4133cce647f3.tar.lz nixlib-4999a38db7c5de0ea9f514a12ecd4133cce647f3.tar.xz nixlib-4999a38db7c5de0ea9f514a12ecd4133cce647f3.tar.zst nixlib-4999a38db7c5de0ea9f514a12ecd4133cce647f3.zip |
Merge commit '8746c77a383f5c76153c7a181f3616d273acfa2a'
Diffstat (limited to 'nixpkgs/pkgs/applications/graphics/ktikz/default.nix')
-rw-r--r-- | nixpkgs/pkgs/applications/graphics/ktikz/default.nix | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/nixpkgs/pkgs/applications/graphics/ktikz/default.nix b/nixpkgs/pkgs/applications/graphics/ktikz/default.nix index c53c70888b2c..4ddc2074f2f4 100644 --- a/nixpkgs/pkgs/applications/graphics/ktikz/default.nix +++ b/nixpkgs/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"'' ]; } |