Merge pull request #174055 from klemensn/libdigidocpp-fix-library-path

libdigidocpp: Fix PKCS11 module library path

pkgs/development/libraries/libdigidocpp/default.nix

@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchurl, cmake, minizip, pcsclite, opensc, openssl
+{ lib, stdenv, fetchurl, cmake, makeWrapper, minizip, pcsclite, opensc, openssl
 , xercesc, xml-security-c, pkg-config, xsd, zlib, xalanc, xxd }:
 
 stdenv.mkDerivation rec {
@@ -10,13 +10,20 @@ stdenv.mkDerivation rec {
      sha256 = "sha256-U5i5IAyJF4359q6M6mQemEuG7+inPYIXqLy8GHv4dkg=";
   };
 
-  nativeBuildInputs = [ cmake pkg-config xxd ];
+  nativeBuildInputs = [ cmake makeWrapper pkg-config xxd ];
 
   buildInputs = [
     minizip pcsclite opensc openssl xercesc
     xml-security-c xsd zlib xalanc
   ];
 
+  # replace this hack with a proper cmake variable or environment variable
+  # once https://github.com/open-eid/cmake/pull/34 (or #35) gets merged.
+  postInstall = ''
+    wrapProgram $out/bin/digidoc-tool \
+      --prefix LD_LIBRARY_PATH : ${opensc}/lib/pkcs11/
+  '';
+
   meta = with lib; {
     description = "Library for creating DigiDoc signature files";
     homepage = "http://www.id.ee/";

pkgs/tools/security/qdigidoc/default.nix

@@ -35,6 +35,8 @@ mkDerivation rec {
     qttranslations
   ];
 
+  # replace this hack with a proper cmake variable or environment variable
+  # once https://github.com/open-eid/cmake/pull/34 (or #35) gets merged.
   qtWrapperArgs = [
       "--prefix LD_LIBRARY_PATH : ${opensc}/lib/pkcs11/"
   ];