Merge pull request #21567 from peterhoeg/p/xca

xca: qt4 -> qt5
This commit is contained in:
Michael Raskin 2017-01-02 14:10:51 +00:00 committed by GitHub
commit 32197ea80b
2 changed files with 20 additions and 8 deletions

View file

@ -1,4 +1,7 @@
{ stdenv, fetchurl, pkgconfig, which, openssl, qt4, libtool, gcc, makeWrapper }:
{ stdenv, fetchurl, pkgconfig, which, makeQtWrapper,
libtool, openssl, qtbase, qttools }:
with stdenv.lib;
stdenv.mkDerivation rec {
name = "xca-${version}";
@ -9,19 +12,28 @@ stdenv.mkDerivation rec {
sha256 = "1r2w9gpahjv221j963bd4vn0gj4cxmb9j42f3cd9qdn890hizw84";
};
postInstall = ''
wrapProgram "$out/bin/xca" \
--prefix LD_LIBRARY_PATH : \
"${gcc.cc.lib}/lib64:${stdenv.lib.makeLibraryPath [ qt4 gcc.cc openssl libtool ]}"
enableParallelBuilding = false;
buildInputs = [ libtool openssl qtbase qttools ];
nativeBuildInputs = [ makeQtWrapper pkgconfig which ];
preBuild = ''
substituteInPlace Local.mak \
--replace ${qtbase}/bin/moc ${qtbase.dev}/bin/moc \
--replace ${qtbase}/bin/uic ${qtbase.dev}/bin/uic
'';
buildInputs = [ openssl qt4 libtool gcc makeWrapper ];
nativeBuildInputs = [ pkgconfig ];
postInstall = ''
wrapQtProgram "$out/bin/xca"
wrapQtProgram "$out/bin/xca_db_stat"
'';
meta = with stdenv.lib; {
description = "Interface for managing asymetric keys like RSA or DSA";
homepage = http://xca.sourceforge.net/;
platforms = platforms.all;
license = licenses.bsd3;
maintainers = with maintainers; [ offline peterhoeg ];
};
}

View file

@ -15499,7 +15499,7 @@ in
};
xbmc-retroarch-advanced-launchers = kodi-retroarch-advanced-launchers;
xca = callPackage ../applications/misc/xca { };
xca = qt5.callPackage ../applications/misc/xca { };
xcalib = callPackage ../tools/X11/xcalib { };