summary refs log tree commit diff
path: root/pkgs/applications/misc
diff options
context:
space:
mode:
authorMichael Raskin <7c6f434c@mail.ru>2017-01-02 14:10:51 +0000
committerGitHub <noreply@github.com>2017-01-02 14:10:51 +0000
commit32197ea80bae3bc510ff03cb86e2f7010e3534d9 (patch)
treebef6e3dcd820755cd6c29274d8071b2e0532dae6 /pkgs/applications/misc
parentc882915351ac81f3e687a22bc4ce7bf754fa1ed6 (diff)
parentaec8872e2398ddc83916ca9eab30d55cacb96c06 (diff)
downloadnixlib-32197ea80bae3bc510ff03cb86e2f7010e3534d9.tar
nixlib-32197ea80bae3bc510ff03cb86e2f7010e3534d9.tar.gz
nixlib-32197ea80bae3bc510ff03cb86e2f7010e3534d9.tar.bz2
nixlib-32197ea80bae3bc510ff03cb86e2f7010e3534d9.tar.lz
nixlib-32197ea80bae3bc510ff03cb86e2f7010e3534d9.tar.xz
nixlib-32197ea80bae3bc510ff03cb86e2f7010e3534d9.tar.zst
nixlib-32197ea80bae3bc510ff03cb86e2f7010e3534d9.zip
Merge pull request #21567 from peterhoeg/p/xca
xca: qt4 -> qt5
Diffstat (limited to 'pkgs/applications/misc')
-rw-r--r--pkgs/applications/misc/xca/default.nix26
1 files changed, 19 insertions, 7 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 ];
   };
 }