public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

qt5: remove makeQtWrapper

Browse Source
This commit is contained in:
Thomas Tuegel
2017-05-17 14:26:11 -05:00
parent 1607f51613
commit c816bbc8a8
92 changed files with 323 additions and 582 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
pkgs/development/tools/tora/default.nix
View File

@@ -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;