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

Merge pull request #66927 from peterhoeg/u/tora

Browse Source 
tora: 3.1 -> 3.2.176
This commit is contained in:
Marek Mahut 2019-08-23 08:34:03 +02:00 committed by GitHub
commit 6abd6c36d2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 15 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,41 +1,37 @@
{ mkDerivation, lib, fetchFromGitHub, cmake, extra-cmake-modules, makeWrapper { mkDerivation, lib, fetchFromGitHub, cmake, extra-cmake-modules, makeWrapper
, boost, doxygen, openssl, mysql, postgresql, graphviz, loki, qscintilla, qtbase }: , boost, doxygen, openssl, mysql, postgresql, graphviz, loki
, qscintilla, qtbase, qttools }:
let mkDerivation rec {
qscintillaLib = (qscintilla.override { withQt5 = true; });
in mkDerivation rec {
pname = "tora"; pname = "tora";
version = "3.1"; version = "3.2.176";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "tora-tool"; owner = "tora-tool";
repo = "tora"; repo = "tora";
rev = "v${version}"; rev = "39bf2837779bf458fc72a9f0e49271152e57829f";
sha256 = "0wninl10bcgiljf6wnhn2rv8kmzryw78x5qvbw8s2zfjlnxjsbn7"; sha256 = "0fr9b542i8r6shgnz33lc3cz333fnxgmac033yxfrdjfglzk0j2k";
}; };
nativeBuildInputs = [ cmake extra-cmake-modules makeWrapper ]; nativeBuildInputs = [ cmake extra-cmake-modules makeWrapper qttools ];
buildInputs = [ buildInputs = [
boost doxygen graphviz loki mysql.connector-c openssl postgresql qscintillaLib qtbase boost doxygen graphviz loki mysql.connector-c openssl postgresql qscintilla qtbase
]; ];
preConfigure = '' preConfigure = ''
sed -i \ substituteInPlace src/widgets/toglobalsetting.cpp \
's|defaultGvHome = "/usr/bin"|defaultGvHome = "${lib.getBin graphviz}/bin"|' \ --replace 'defaultGvHome = "/usr/bin"' 'defaultGvHome = "${lib.getBin graphviz}/bin"'
src/widgets/toglobalsetting.cpp substituteInPlace extlibs/libermodel/dotgraph.cpp \
--replace /usr/bin/dot ${lib.getBin graphviz}/bin/dot
sed -i \
's|/usr/bin/dot|${lib.getBin graphviz}/bin/dot|' \
extlibs/libermodel/dotgraph.cpp
''; '';
cmakeFlags = [ cmakeFlags = [
"-DWANT_INTERNAL_LOKI=0" "-DWANT_INTERNAL_LOKI=0"
"-DWANT_INTERNAL_QSCINTILLA=0" "-DWANT_INTERNAL_QSCINTILLA=0"
# cmake/modules/FindQScintilla.cmake looks in qtbase and for the wrong library name # cmake/modules/FindQScintilla.cmake looks in qtbase and for the wrong library name
"-DQSCINTILLA_INCLUDE_DIR=${qscintillaLib}/include" "-DQSCINTILLA_INCLUDE_DIR=${qscintilla}/include"
"-DQSCINTILLA_LIBRARY=${qscintillaLib}/lib/libqscintilla2.so" "-DQSCINTILLA_LIBRARY=${qscintilla}/lib/libqscintilla2.so"
"-DENABLE_DB2=0" "-DENABLE_DB2=0"
"-DENABLE_ORACLE=0" "-DENABLE_ORACLE=0"
"-DENABLE_TERADATA=0" "-DENABLE_TERADATA=0"