diff options
author | Thomas Tuegel <ttuegel@mailbox.org> | 2017-05-17 14:26:11 -0500 |
---|---|---|
committer | Thomas Tuegel <ttuegel@mailbox.org> | 2017-06-18 08:44:42 -0500 |
commit | c816bbc8a86c7ea6c09ca42e1694fe08003a55fc (patch) | |
tree | 036a3c0d8a3a6a4be068cf153a863fc0114ef28f /pkgs/development/tools | |
parent | 1607f51613fc63a6fbfc1884c55a9efea06161b3 (diff) | |
download | nixlib-c816bbc8a86c7ea6c09ca42e1694fe08003a55fc.tar nixlib-c816bbc8a86c7ea6c09ca42e1694fe08003a55fc.tar.gz nixlib-c816bbc8a86c7ea6c09ca42e1694fe08003a55fc.tar.bz2 nixlib-c816bbc8a86c7ea6c09ca42e1694fe08003a55fc.tar.lz nixlib-c816bbc8a86c7ea6c09ca42e1694fe08003a55fc.tar.xz nixlib-c816bbc8a86c7ea6c09ca42e1694fe08003a55fc.tar.zst nixlib-c816bbc8a86c7ea6c09ca42e1694fe08003a55fc.zip |
qt5: remove makeQtWrapper
Diffstat (limited to 'pkgs/development/tools')
-rw-r--r-- | pkgs/development/tools/analysis/qcachegrind/default.nix | 6 | ||||
-rw-r--r-- | pkgs/development/tools/database/sqlitebrowser/default.nix | 18 | ||||
-rw-r--r-- | pkgs/development/tools/tora/default.nix | 12 | ||||
-rw-r--r-- | pkgs/development/tools/vogl/default.nix | 20 |
4 files changed, 23 insertions, 33 deletions
diff --git a/pkgs/development/tools/analysis/qcachegrind/default.nix b/pkgs/development/tools/analysis/qcachegrind/default.nix index 7caac253435e..395f720906c9 100644 --- a/pkgs/development/tools/analysis/qcachegrind/default.nix +++ b/pkgs/development/tools/analysis/qcachegrind/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, cmake, qmake, makeQtWrapper, qtbase, perl, python, php }: +{ stdenv, fetchurl, cmake, qmake, qtbase, perl, python, php }: stdenv.mkDerivation rec { name = "qcachegrind-${version}"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { buildInputs = [ qtbase perl python php ]; - nativeBuildInputs = [ qmake makeQtWrapper ]; + nativeBuildInputs = [ qmake ]; postInstall = '' mkdir -p $out/bin @@ -25,10 +25,8 @@ stdenv.mkDerivation rec { mkdir -p $out/Applications cp cgview/cgview.app/Contents/MacOS/cgview $out/bin cp -a qcachegrind/qcachegrind.app $out/Applications - wrapQtProgram $out/Applications/qcachegrind.app/Contents/MacOS/qcachegrind '' else '' install qcachegrind/qcachegrind cgview/cgview -t "$out/bin" - wrapQtProgram "$out/bin/qcachegrind" install -Dm644 qcachegrind/qcachegrind.desktop -t "$out/share/applications" install -Dm644 kcachegrind/hi32-app-kcachegrind.png "$out/share/icons/hicolor/32x32/apps/kcachegrind.png" install -Dm644 kcachegrind/hi48-app-kcachegrind.png "$out/share/icons/hicolor/48x48/apps/kcachegrind.png" diff --git a/pkgs/development/tools/database/sqlitebrowser/default.nix b/pkgs/development/tools/database/sqlitebrowser/default.nix index 28c618c29a0e..a43d3928980e 100644 --- a/pkgs/development/tools/database/sqlitebrowser/default.nix +++ b/pkgs/development/tools/database/sqlitebrowser/default.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchFromGitHub, qtbase, qttools, makeQtWrapper, sqlite, cmake }: +{ mkDerivation, lib, fetchFromGitHub, qtbase, qttools, sqlite, cmake }: -stdenv.mkDerivation rec { +mkDerivation rec { version = "3.9.1"; name = "sqlitebrowser-${version}"; @@ -12,23 +12,17 @@ stdenv.mkDerivation rec { }; buildInputs = [ qtbase qttools sqlite ]; - nativeBuildInputs = [ makeQtWrapper cmake ]; - - enableParallelBuilding = true; - + nativeBuildInputs = [ cmake ]; + cmakeFlags = [ "-DUSE_QT5=TRUE" ]; - + # A regression was introduced in CMakeLists.txt on v3.9.x # See https://github.com/sqlitebrowser/sqlitebrowser/issues/832 and issues/755 postPatch = '' substituteInPlace CMakeLists.txt --replace 'project("DB Browser for SQLite")' 'project(sqlitebrowser)' ''; - postInstall = '' - wrapQtProgram $out/bin/sqlitebrowser - ''; - - meta = with stdenv.lib; { + meta = with lib; { description = "DB Browser for SQLite"; homepage = "http://sqlitebrowser.org/"; license = licenses.gpl3; diff --git a/pkgs/development/tools/tora/default.nix b/pkgs/development/tools/tora/default.nix index 350cda4e2630..578e759548a1 100644 --- a/pkgs/development/tools/tora/default.nix +++ b/pkgs/development/tools/tora/default.nix @@ -1,10 +1,10 @@ -{ stdenv, lib, fetchFromGitHub, cmake, extra-cmake-modules, makeQtWrapper +{ mkDerivation, lib, fetchFromGitHub, cmake, extra-cmake-modules, makeWrapper , boost, doxygen, openssl, mysql, postgresql, graphviz, loki, qscintilla, qtbase }: let qscintillaLib = (qscintilla.override { withQt5 = true; }); -in stdenv.mkDerivation rec { +in mkDerivation rec { name = "tora-${version}"; version = "3.1"; @@ -15,10 +15,8 @@ in stdenv.mkDerivation rec { sha256 = "0wninl10bcgiljf6wnhn2rv8kmzryw78x5qvbw8s2zfjlnxjsbn7"; }; - enableParallelBuilding = true; - + nativeBuildInputs = [ cmake extra-cmake-modules makeWrapper ]; buildInputs = [ - cmake extra-cmake-modules makeQtWrapper boost doxygen graphviz loki mysql openssl postgresql qscintillaLib qtbase ]; @@ -54,11 +52,11 @@ in stdenv.mkDerivation rec { ]; postFixup = '' - wrapQtProgram $out/bin/tora \ + wrapProgram $out/bin/tora \ --prefix PATH : ${lib.getBin graphviz}/bin ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Tora SQL tool"; maintainers = with maintainers; [ peterhoeg ]; platforms = platforms.linux; diff --git a/pkgs/development/tools/vogl/default.nix b/pkgs/development/tools/vogl/default.nix index 56f15d62154c..e351a75db4b2 100644 --- a/pkgs/development/tools/vogl/default.nix +++ b/pkgs/development/tools/vogl/default.nix @@ -1,11 +1,12 @@ -{ fetchFromGitHub, stdenv +{ mkDerivation, lib, fetchFromGitHub , cmake, git, pkgconfig, wget, zip -, makeQtWrapper, qtbase, qtx11extras +, qtbase, qtx11extras , libdwarf, libjpeg_turbo, libunwind, lzma, tinyxml, libX11 , SDL2, SDL2_gfx, SDL2_image, SDL2_ttf , freeglut, mesa_glu }: -stdenv.mkDerivation rec { + +mkDerivation rec { name = "vogl-${version}"; version = "2016-05-13"; @@ -16,9 +17,7 @@ stdenv.mkDerivation rec { sha256 = "17gwd73x3lnqv6ccqs48pzqwbzjhbn41c0x0l5zzirhiirb3yh0n"; }; - nativeBuildInputs = [ - cmake makeQtWrapper pkgconfig - ]; + nativeBuildInputs = [ cmake pkgconfig ]; buildInputs = [ git wget zip @@ -28,16 +27,17 @@ stdenv.mkDerivation rec { freeglut mesa_glu ]; - enableParallelBuilding = true; - dontUseCmakeBuildDir = true; preConfigure = '' cmakeDir=$PWD mkdir -p vogl/vogl_build/release64 && cd $_ ''; - cmakeFlags = '' -DCMAKE_VERBOSE=On -DCMAKE_BUILD_TYPE=Release -DBUILD_X64=On''; + cmakeFlags = [ + "-DCMAKE_VERBOSE=On" + "-DBUILD_X64=On" + ]; - meta = with stdenv.lib; { + meta = with lib; { description = "OpenGL capture / playback debugger."; homepage = https://github.com/ValveSoftware/vogl; license = licenses.mit; |