From aec8872e2398ddc83916ca9eab30d55cacb96c06 Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Fri, 21 Oct 2016 12:27:01 +0800 Subject: [PATCH] xca: qt4 -> qt5 Compile against qt5 instead of qt4. --- pkgs/applications/misc/xca/default.nix | 26 +++++++++++++++++++------- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 20 insertions(+), 8 deletions(-) diff --git a/pkgs/applications/misc/xca/default.nix b/pkgs/applications/misc/xca/default.nix index e861973b13cc..8515efc56bce 100644 --- a/pkgs/applications/misc/xca/default.nix +++ b/pkgs/applications/misc/xca/default.nix @@ -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 ]; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 465a872aa2bb..2f39b72a4952 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15476,7 +15476,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 { };