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

qdigidoc: Wrap just once

Browse Source 
Merge `LD_LIBRARY_PATH` fixing into the automatic Qt wrapping hook.
Otherwise `argv[0]` ends up as ".qdigidoc4-wrapped" due extra wrapping.
This commit is contained in:
Klemens Nanni 2022-05-30 01:08:49 +02:00 committed by Florian Klink
parent b450c76786
commit 1d46988e13
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
pkgs/tools/security/qdigidoc/default.nix
View File

@ -1,4 +1,4 @@
{ lib, mkDerivation, fetchurl, cmake, gettext, makeWrapper
{ lib, mkDerivation, fetchurl, cmake, gettext
, pkg-config, libdigidocpp, opensc, openldap, openssl, pcsclite, qtbase
, qttranslations, qtsvg }:
@ -17,7 +17,7 @@ mkDerivation rec {
sha256 = "1cikz36w9phgczcqnwk4k3mx3kk919wy2327jksmfa4cjfjq4a8d";
};
nativeBuildInputs = [ cmake gettext makeWrapper pkg-config ];
nativeBuildInputs = [ cmake gettext pkg-config ];
postPatch = ''
substituteInPlace client/CMakeLists.txt \
@ -35,10 +35,9 @@ mkDerivation rec {
qttranslations
];
postInstall = ''
wrapProgram $out/bin/qdigidoc4 \
--prefix LD_LIBRARY_PATH : ${opensc}/lib/pkcs11/
'';
qtWrapperArgs = [
"--prefix LD_LIBRARY_PATH : ${opensc}/lib/pkcs11/"
];
meta = with lib; {
description = "Qt-based UI for signing and verifying DigiDoc documents";