mirror of
https://github.com/ilyakooo0/nixpkgs.git
synced 2024-09-23 13:48:21 +03:00
Merge pull request #57818 from illegalprime/fix/gnupg-cross
gnupg: use config flags to find lib prefix instead of their binary tools
This commit is contained in:
commit
98dcfed615
@ -1,5 +1,6 @@
|
|||||||
{ fetchurl, stdenv, pkgconfig, libgcrypt, libassuan, libksba
|
{ fetchurl, stdenv, pkgconfig, libgcrypt, libassuan, libksba, libgpgerror
|
||||||
, libiconv, npth, gettext, texinfo, pcsclite, sqlite
|
, libiconv, npth, gettext, texinfo, pcsclite, sqlite
|
||||||
|
, buildPackages
|
||||||
|
|
||||||
# Each of the dependencies below are optional.
|
# Each of the dependencies below are optional.
|
||||||
# Gnupg can be built without them at the cost of reduced functionality.
|
# Gnupg can be built without them at the cost of reduced functionality.
|
||||||
@ -22,6 +23,7 @@ stdenv.mkDerivation rec {
|
|||||||
sha256 = "0yzqrg24j9fc4f8ss5pclyvg70a9z53sv89vl77xii8yvi3fvy8v";
|
sha256 = "0yzqrg24j9fc4f8ss5pclyvg70a9z53sv89vl77xii8yvi3fvy8v";
|
||||||
};
|
};
|
||||||
|
|
||||||
|
depsBuildBuild = [ buildPackages.stdenv.cc ];
|
||||||
nativeBuildInputs = [ pkgconfig ];
|
nativeBuildInputs = [ pkgconfig ];
|
||||||
buildInputs = [
|
buildInputs = [
|
||||||
libgcrypt libassuan libksba libiconv npth gettext texinfo
|
libgcrypt libassuan libksba libiconv npth gettext texinfo
|
||||||
@ -36,7 +38,13 @@ stdenv.mkDerivation rec {
|
|||||||
''; #" fix Emacs syntax highlighting :-(
|
''; #" fix Emacs syntax highlighting :-(
|
||||||
|
|
||||||
pinentryBinaryPath = pinentry.binaryPath or "bin/pinentry";
|
pinentryBinaryPath = pinentry.binaryPath or "bin/pinentry";
|
||||||
configureFlags = optional guiSupport "--with-pinentry-pgm=${pinentry}/${pinentryBinaryPath}";
|
configureFlags = [
|
||||||
|
"--with-libgpg-error-prefix=${libgpgerror.dev}"
|
||||||
|
"--with-libgcrypt-prefix=${libgcrypt.dev}"
|
||||||
|
"--with-libassuan-prefix=${libassuan.dev}"
|
||||||
|
"--with-ksba-prefix=${libksba.dev}"
|
||||||
|
"--with-npth-prefix=${npth}"
|
||||||
|
] ++ optional guiSupport "--with-pinentry-pgm=${pinentry}/${pinentryBinaryPath}";
|
||||||
|
|
||||||
postInstall = ''
|
postInstall = ''
|
||||||
mkdir -p $out/lib/systemd/user
|
mkdir -p $out/lib/systemd/user
|
||||||
|
Loading…
Reference in New Issue
Block a user