diff options
author | Klemens Nanni <klemens@posteo.de> | 2022-05-30 01:08:49 +0200 |
---|---|---|
committer | Florian Klink <flokli@flokli.de> | 2022-06-02 20:39:19 +0200 |
commit | 1d46988e136fec6d885877b74dba7f70ee9c70df (patch) | |
tree | 1782e511af9b21c726ab3813b9cf627100201d92 /pkgs/tools/security/qdigidoc | |
parent | b450c76786ade693ca3e6b59e7a0f7a66443abb9 (diff) |
qdigidoc: Wrap just once
Merge `LD_LIBRARY_PATH` fixing into the automatic Qt wrapping hook. Otherwise `argv[0]` ends up as ".qdigidoc4-wrapped" due extra wrapping.
Diffstat (limited to 'pkgs/tools/security/qdigidoc')
-rw-r--r-- | pkgs/tools/security/qdigidoc/default.nix | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/pkgs/tools/security/qdigidoc/default.nix b/pkgs/tools/security/qdigidoc/default.nix index 03fbd98baf765..e148892967518 100644 --- a/pkgs/tools/security/qdigidoc/default.nix +++ b/pkgs/tools/security/qdigidoc/default.nix @@ -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"; |