diff options
Diffstat (limited to 'pkgs/development/tools')
8 files changed, 16 insertions, 2 deletions
diff --git a/pkgs/development/tools/analysis/panopticon/default.nix b/pkgs/development/tools/analysis/panopticon/default.nix index 0ef33270e92..91f3f24d6f1 100644 --- a/pkgs/development/tools/analysis/panopticon/default.nix +++ b/pkgs/development/tools/analysis/panopticon/default.nix @@ -23,6 +23,8 @@ rustPlatform.buildRustPackage rec { git ]; + dontWrapQtApps = true; + cargoSha256 = "1hdsn011y9invfy7can8c02zwa7birj9y1rxhrj7wyv4gh3659i0"; doCheck = false; diff --git a/pkgs/development/tools/analysis/qcachegrind/default.nix b/pkgs/development/tools/analysis/qcachegrind/default.nix index 0145e51ee26..5e321db01aa 100644 --- a/pkgs/development/tools/analysis/qcachegrind/default.nix +++ b/pkgs/development/tools/analysis/qcachegrind/default.nix @@ -12,6 +12,8 @@ in stdenv.mkDerivation { nativeBuildInputs = [ qmake ]; + dontWrapQtApps = true; + postInstall = '' mkdir -p $out/bin cp -p converters/dprof2calltree $out/bin/dprof2calltree diff --git a/pkgs/development/tools/build-managers/cmake/default.nix b/pkgs/development/tools/build-managers/cmake/default.nix index 5e5875cc36c..5de894bd1b4 100644 --- a/pkgs/development/tools/build-managers/cmake/default.nix +++ b/pkgs/development/tools/build-managers/cmake/default.nix @@ -14,7 +14,7 @@ assert withQt5 -> useQt4 == false; assert useQt4 -> withQt5 == false; -stdenv.mkDerivation rec { +stdenv.mkDerivation (rec { pname = "cmake" + lib.optionalString isBootstrap "-boot" + lib.optionalString useNcurses "-cursesUI" @@ -130,4 +130,5 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ ttuegel lnl7 ]; license = licenses.bsd3; }; -} +} // (if withQt5 then { dontWrapQtApps = true; } else {}) +) diff --git a/pkgs/development/tools/build-managers/qbs/default.nix b/pkgs/development/tools/build-managers/qbs/default.nix index 3bf7623ed04..73c23b88752 100644 --- a/pkgs/development/tools/build-managers/qbs/default.nix +++ b/pkgs/development/tools/build-managers/qbs/default.nix @@ -14,6 +14,8 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ qmake ]; + dontWrapQtApps = true; + qmakeFlags = [ "QBS_INSTALL_PREFIX=$(out)" "qbs.pro" ]; buildInputs = [ qtbase qtscript ]; diff --git a/pkgs/development/tools/minizinc/ide.nix b/pkgs/development/tools/minizinc/ide.nix index 7709423e676..fd366cc39a5 100644 --- a/pkgs/development/tools/minizinc/ide.nix +++ b/pkgs/development/tools/minizinc/ide.nix @@ -19,6 +19,7 @@ stdenv.mkDerivation { sourceRoot = "source/MiniZincIDE"; enableParallelBuilding = true; + dontWrapQtApps = true; postInstall = '' wrapProgram $out/bin/MiniZincIDE --prefix PATH ":" ${lib.makeBinPath [ minizinc ]} diff --git a/pkgs/development/tools/misc/kdbg/default.nix b/pkgs/development/tools/misc/kdbg/default.nix index dad7d41c1f6..35e0a52865f 100644 --- a/pkgs/development/tools/misc/kdbg/default.nix +++ b/pkgs/development/tools/misc/kdbg/default.nix @@ -18,6 +18,8 @@ stdenv.mkDerivation rec { wrapProgram $out/bin/kdbg --prefix QT_PLUGIN_PATH : ${qtbase}/${qtbase.qtPluginPrefix} ''; + dontWrapQtApps = true; + meta = with lib; { homepage = "https://www.kdbg.org/"; description = '' diff --git a/pkgs/development/tools/phantomjs2/default.nix b/pkgs/development/tools/phantomjs2/default.nix index 594deeb1c73..3d0db49aedc 100644 --- a/pkgs/development/tools/phantomjs2/default.nix +++ b/pkgs/development/tools/phantomjs2/default.nix @@ -77,6 +77,8 @@ in stdenv.mkDerivation rec { enableParallelBuilding = true; + dontWrapQtApps = true; + installPhase = '' mkdir -p $out/share/doc/phantomjs cp -a bin $out diff --git a/pkgs/development/tools/rgp/default.nix b/pkgs/development/tools/rgp/default.nix index 8beeccfa2fd..3cfd608e225 100644 --- a/pkgs/development/tools/rgp/default.nix +++ b/pkgs/development/tools/rgp/default.nix @@ -53,6 +53,8 @@ stdenv.mkDerivation rec { "${placeholder "out"}/opt/rgp/qt" ]; + dontWrapQtApps = true; + installPhase = '' mkdir -p $out/opt/rgp $out/bin cp -r . $out/opt/rgp/ |