cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

Merge pull request #175376 from klemensn/qdigidoc-fix-wrap

Browse source 
qdigidoc: Wrap just once
This commit is contained in:
Florian Klink 2022-06-02 20:40:05 +02:00 committed by GitHub
commit 292a529bd3
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
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 , pkg-config, libdigidocpp, opensc, openldap, openssl, pcsclite, qtbase
, qttranslations, qtsvg }: , qttranslations, qtsvg }:
@ -17,7 +17,7 @@ mkDerivation rec {
sha256 = "1cikz36w9phgczcqnwk4k3mx3kk919wy2327jksmfa4cjfjq4a8d"; sha256 = "1cikz36w9phgczcqnwk4k3mx3kk919wy2327jksmfa4cjfjq4a8d";
}; };
nativeBuildInputs = [ cmake gettext makeWrapper pkg-config ]; nativeBuildInputs = [ cmake gettext pkg-config ];
postPatch = '' postPatch = ''
substituteInPlace client/CMakeLists.txt \ substituteInPlace client/CMakeLists.txt \
@ -35,10 +35,9 @@ mkDerivation rec {
qttranslations qttranslations
]; ];
postInstall = '' qtWrapperArgs = [
wrapProgram $out/bin/qdigidoc4 \ "--prefix LD_LIBRARY_PATH : ${opensc}/lib/pkcs11/"
--prefix LD_LIBRARY_PATH : ${opensc}/lib/pkcs11/ ];
'';
meta = with lib; { meta = with lib; {
description = "Qt-based UI for signing and verifying DigiDoc documents"; description = "Qt-based UI for signing and verifying DigiDoc documents";