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/tora | |
parent | 1607f51613fc63a6fbfc1884c55a9efea06161b3 (diff) | |
download | nixpkgs-c816bbc8a86c7ea6c09ca42e1694fe08003a55fc.tar nixpkgs-c816bbc8a86c7ea6c09ca42e1694fe08003a55fc.tar.gz nixpkgs-c816bbc8a86c7ea6c09ca42e1694fe08003a55fc.tar.bz2 nixpkgs-c816bbc8a86c7ea6c09ca42e1694fe08003a55fc.tar.lz nixpkgs-c816bbc8a86c7ea6c09ca42e1694fe08003a55fc.tar.xz nixpkgs-c816bbc8a86c7ea6c09ca42e1694fe08003a55fc.tar.zst nixpkgs-c816bbc8a86c7ea6c09ca42e1694fe08003a55fc.zip |
qt5: remove makeQtWrapper
Diffstat (limited to 'pkgs/development/tools/tora')
-rw-r--r-- | pkgs/development/tools/tora/default.nix | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/pkgs/development/tools/tora/default.nix b/pkgs/development/tools/tora/default.nix index 350cda4e263..578e759548a 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; |