diff options
| author | Thomas Tuegel <ttuegel@mailbox.org> | 2019-07-05 10:42:08 -0500 |
|---|---|---|
| committer | Thomas Tuegel <ttuegel@mailbox.org> | 2019-07-05 10:42:08 -0500 |
| commit | 51d78034a1db78f8ce0ea3ba6fa20be590ed0ca2 (patch) | |
| tree | 0b9751f2bfd16a70e406b420c34a8d4097ad9492 /pkgs/applications/editors | |
| parent | f79fd2e826dd95b3b64839d3e0bec8ae1dfab17e (diff) | |
| download | nixlib-51d78034a1db78f8ce0ea3ba6fa20be590ed0ca2.tar nixlib-51d78034a1db78f8ce0ea3ba6fa20be590ed0ca2.tar.gz nixlib-51d78034a1db78f8ce0ea3ba6fa20be590ed0ca2.tar.bz2 nixlib-51d78034a1db78f8ce0ea3ba6fa20be590ed0ca2.tar.lz nixlib-51d78034a1db78f8ce0ea3ba6fa20be590ed0ca2.tar.xz nixlib-51d78034a1db78f8ce0ea3ba6fa20be590ed0ca2.tar.zst nixlib-51d78034a1db78f8ce0ea3ba6fa20be590ed0ca2.zip | |
wrapQtAppsHook: Remove ad hoc Qt wrappers
Diffstat (limited to 'pkgs/applications/editors')
| -rw-r--r-- | pkgs/applications/editors/kdevelop5/kdevelop.nix | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/pkgs/applications/editors/kdevelop5/kdevelop.nix b/pkgs/applications/editors/kdevelop5/kdevelop.nix index 23ec887ad621..c17239d4fd91 100644 --- a/pkgs/applications/editors/kdevelop5/kdevelop.nix +++ b/pkgs/applications/editors/kdevelop5/kdevelop.nix @@ -43,6 +43,8 @@ mkDerivation rec { "-DCLANG_BUILTIN_DIR=${llvmPackages.clang-unwrapped}/lib/clang/${(builtins.parseDrvName llvmPackages.clang.name).version}/include" ]; + dontWrapQtApps = true; + postPatch = '' # FIXME: temporary until https://invent.kde.org/kde/kdevelop/merge_requests/8 is merged substituteInPlace kdevplatform/language/backgroundparser/parsejob.cpp --replace \ @@ -55,8 +57,7 @@ mkDerivation rec { wrapProgram "$out/bin/kdevelop!" \ --prefix PATH ":" "${lib.makeBinPath [ qttools kde-cli-tools ]}" - wrapProgram "$out/bin/kdevelop" \ - --prefix QT_PLUGIN_PATH : $out/lib/qt-${qtVersion}/plugins + wrapQtApp "$out/bin/kdevelop" # Fix the (now wrapped) kdevelop! to find things in right places: # - Fixup the one use where KDEV_BASEDIR is assumed to contain kdevelop. |