diff options
| author | Alyssa Ross <hi@alyssa.is> | 2021-10-19 14:40:23 +0000 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2022-01-07 10:22:32 +0000 |
| commit | cc62bcb55359ba8c5e0fe3a48e778444c89060d8 (patch) | |
| tree | ca0e21d44eaf8837b687395e614445f7761d7bbd /nixpkgs/pkgs/development/libraries/gpgme | |
| parent | d6625e8d25efd829c3cfa227d025ca4e606ae4b7 (diff) | |
| parent | a323570a264da96a0b0bcc1c9aa017794acdc752 (diff) | |
| download | nixlib-cc62bcb55359ba8c5e0fe3a48e778444c89060d8.tar nixlib-cc62bcb55359ba8c5e0fe3a48e778444c89060d8.tar.gz nixlib-cc62bcb55359ba8c5e0fe3a48e778444c89060d8.tar.bz2 nixlib-cc62bcb55359ba8c5e0fe3a48e778444c89060d8.tar.lz nixlib-cc62bcb55359ba8c5e0fe3a48e778444c89060d8.tar.xz nixlib-cc62bcb55359ba8c5e0fe3a48e778444c89060d8.tar.zst nixlib-cc62bcb55359ba8c5e0fe3a48e778444c89060d8.zip | |
Merge commit 'a323570a264da96a0b0bcc1c9aa017794acdc752'
Diffstat (limited to 'nixpkgs/pkgs/development/libraries/gpgme')
| -rw-r--r-- | nixpkgs/pkgs/development/libraries/gpgme/default.nix | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/nixpkgs/pkgs/development/libraries/gpgme/default.nix b/nixpkgs/pkgs/development/libraries/gpgme/default.nix index c1c9460fad69..263807c2fc1d 100644 --- a/nixpkgs/pkgs/development/libraries/gpgme/default.nix +++ b/nixpkgs/pkgs/development/libraries/gpgme/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, fetchpatch -, autoreconfHook, libgpgerror, gnupg, pkg-config, glib, pth, libassuan +, autoreconfHook, libgpg-error, gnupg, pkg-config, glib, pth, libassuan , file, which, ncurses , texinfo , buildPackages @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { outputBin = "dev"; # gpgme-config; not so sure about gpgme-tool propagatedBuildInputs = - [ libgpgerror glib libassuan pth ] + [ libgpg-error glib libassuan pth ] ++ lib.optional (qtbase != null) qtbase; nativeBuildInputs = [ pkg-config gnupg texinfo autoreconfHook ] @@ -52,7 +52,7 @@ stdenv.mkDerivation rec { configureFlags = [ "--enable-fixed-path=${gnupg}/bin" - "--with-libgpg-error-prefix=${libgpgerror.dev}" + "--with-libgpg-error-prefix=${libgpg-error.dev}" "--with-libassuan-prefix=${libassuan.dev}" ] ++ lib.optional pythonSupport "--enable-languages=python" # Tests will try to communicate with gpg-agent instance via a UNIX socket |