Merge pull request #136719 from r-burns/libgpg-error
This commit is contained in:
commit
628dbc979f
|
@ -14,7 +14,7 @@
|
|||
, libsecret
|
||||
, libhandy
|
||||
, wrapGAppsHook
|
||||
, libgpgerror
|
||||
, libgpg-error
|
||||
, json-glib
|
||||
, duplicity
|
||||
}:
|
||||
|
@ -54,7 +54,7 @@ stdenv.mkDerivation rec {
|
|||
gtk3
|
||||
libsecret
|
||||
libhandy
|
||||
libgpgerror
|
||||
libgpg-error
|
||||
json-glib
|
||||
];
|
||||
|
||||
|
|
|
@ -7,7 +7,7 @@
|
|||
, qtmacextras
|
||||
, monero, miniupnpc, unbound, readline
|
||||
, boost, libunwind, libsodium, pcsclite
|
||||
, randomx, zeromq, libgcrypt, libgpgerror
|
||||
, randomx, zeromq, libgcrypt, libgpg-error
|
||||
, hidapi, rapidjson, quirc
|
||||
, trezorSupport ? true, libusb1, protobuf, python3
|
||||
}:
|
||||
|
@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
|
|||
qtmultimedia qtquickcontrols qtquickcontrols2
|
||||
qtxmlpatterns
|
||||
monero miniupnpc unbound readline
|
||||
randomx libgcrypt libgpgerror
|
||||
randomx libgcrypt libgpg-error
|
||||
boost libunwind libsodium pcsclite
|
||||
zeromq hidapi rapidjson quirc
|
||||
] ++ lib.optionals trezorSupport [ libusb1 protobuf python3 ]
|
||||
|
|
|
@ -1,11 +1,11 @@
|
|||
{ stdenv, lib, zlib, glib, alsa-lib, dbus, gtk2, atk, pango, freetype, fontconfig
|
||||
, libgnome-keyring3, gdk-pixbuf, cairo, cups, expat, libgpgerror, nspr
|
||||
, libgnome-keyring3, gdk-pixbuf, cairo, cups, expat, libgpg-error, nspr
|
||||
, nss, xorg, libcap, systemd, libnotify, libsecret, gnome2 }:
|
||||
|
||||
let
|
||||
packages = [
|
||||
stdenv.cc.cc zlib glib dbus gtk2 atk pango freetype libgnome-keyring3
|
||||
fontconfig gdk-pixbuf cairo cups expat libgpgerror alsa-lib nspr nss
|
||||
fontconfig gdk-pixbuf cairo cups expat libgpg-error alsa-lib nspr nss
|
||||
xorg.libXrender xorg.libX11 xorg.libXext xorg.libXdamage xorg.libXtst
|
||||
xorg.libXcomposite xorg.libXi xorg.libXfixes xorg.libXrandr
|
||||
xorg.libXcursor xorg.libxkbfile xorg.libXScrnSaver libcap systemd libnotify
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
{ stdenv, lib, zlib, glib, alsa-lib, dbus, gtk3, atk, pango, freetype, fontconfig
|
||||
, libgnome-keyring3, gdk-pixbuf, cairo, cups, expat, libgpgerror, nspr
|
||||
, libgnome-keyring3, gdk-pixbuf, cairo, cups, expat, libgpg-error, nspr
|
||||
, gconf, nss, xorg, libcap, systemd, libnotify, libsecret, libuuid, at-spi2-atk
|
||||
, at-spi2-core, libdbusmenu, libdrm, mesa
|
||||
}:
|
||||
|
@ -7,7 +7,7 @@
|
|||
let
|
||||
packages = [
|
||||
stdenv.cc.cc zlib glib dbus gtk3 atk pango freetype libgnome-keyring3
|
||||
fontconfig gdk-pixbuf cairo cups expat libgpgerror alsa-lib nspr gconf nss
|
||||
fontconfig gdk-pixbuf cairo cups expat libgpg-error alsa-lib nspr gconf nss
|
||||
xorg.libXrender xorg.libX11 xorg.libXext xorg.libXdamage xorg.libXtst
|
||||
xorg.libXcomposite xorg.libXi xorg.libXfixes xorg.libXrandr
|
||||
xorg.libXcursor xorg.libxkbfile xorg.libXScrnSaver libcap systemd libnotify
|
||||
|
|
|
@ -1,12 +1,12 @@
|
|||
{ stdenv, lib, fetchurl, zlib, glib, alsa-lib, makeDesktopItem
|
||||
, dbus, gtk2, atk, pango, freetype, fontconfig, libgnome-keyring3, gdk-pixbuf
|
||||
, cairo, cups, expat, libgpgerror, nspr, gnome2, nss, xorg, systemd, libnotify
|
||||
, cairo, cups, expat, libgpg-error, nspr, gnome2, nss, xorg, systemd, libnotify
|
||||
}:
|
||||
|
||||
let
|
||||
libPath = lib.makeLibraryPath [
|
||||
stdenv.cc.cc zlib glib dbus gtk2 atk pango freetype libgnome-keyring3 nss
|
||||
fontconfig gdk-pixbuf cairo cups expat libgpgerror alsa-lib nspr gnome2.GConf
|
||||
fontconfig gdk-pixbuf cairo cups expat libgpg-error alsa-lib nspr gnome2.GConf
|
||||
xorg.libXrender xorg.libX11 xorg.libXext xorg.libXdamage xorg.libXtst
|
||||
xorg.libXcomposite xorg.libXi xorg.libXfixes libnotify xorg.libXrandr
|
||||
xorg.libXcursor
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
{ lib, stdenv, fetchurl, intltool, pkg-config, gtk2, gpgme, libgpgerror, libassuan }:
|
||||
{ lib, stdenv, fetchurl, intltool, pkg-config, gtk2, gpgme, libgpg-error, libassuan }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "gpa-0.10.0";
|
||||
|
@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
|
|||
};
|
||||
|
||||
nativeBuildInputs = [ intltool pkg-config ];
|
||||
buildInputs = [ gtk2 gpgme libgpgerror libassuan ];
|
||||
buildInputs = [ gtk2 gpgme libgpg-error libassuan ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Graphical user interface for the GnuPG";
|
||||
|
|
|
@ -11,7 +11,7 @@
|
|||
, libXtst
|
||||
, libargon2
|
||||
, libgcrypt
|
||||
, libgpgerror
|
||||
, libgpg-error
|
||||
, libsodium
|
||||
, libyubikey
|
||||
, pkg-config
|
||||
|
@ -99,7 +99,7 @@ stdenv.mkDerivation rec {
|
|||
libXtst
|
||||
libargon2
|
||||
libgcrypt
|
||||
libgpgerror
|
||||
libgpg-error
|
||||
libsodium
|
||||
libyubikey
|
||||
qrencode
|
||||
|
|
|
@ -14,7 +14,7 @@
|
|||
, libgcrypt
|
||||
, libotr
|
||||
, html-tidy
|
||||
, libgpgerror
|
||||
, libgpg-error
|
||||
, libsignal-protocol-c
|
||||
, usrsctp
|
||||
|
||||
|
@ -76,7 +76,7 @@ mkDerivation rec {
|
|||
libgcrypt
|
||||
libotr
|
||||
html-tidy
|
||||
libgpgerror
|
||||
libgpg-error
|
||||
libsignal-protocol-c
|
||||
usrsctp
|
||||
] ++ lib.optionals voiceMessagesSupport [
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
{ lib, stdenv, fetchurl, pkg-config, pcre, perl, flex, bison, gettext, libpcap, libnl, c-ares
|
||||
, gnutls, libgcrypt, libgpgerror, geoip, openssl, lua5, python3, libcap, glib
|
||||
, gnutls, libgcrypt, libgpg-error, geoip, openssl, lua5, python3, libcap, glib
|
||||
, libssh, nghttp2, zlib, cmake, makeWrapper
|
||||
, withQt ? true, qt5 ? null
|
||||
, ApplicationServices, SystemConfiguration, gmp
|
||||
|
@ -37,7 +37,7 @@ in stdenv.mkDerivation {
|
|||
|
||||
buildInputs = [
|
||||
gettext pcre perl libpcap lua5 libssh nghttp2 openssl libgcrypt
|
||||
libgpgerror gnutls geoip c-ares python3 glib zlib
|
||||
libgpg-error gnutls geoip c-ares python3 glib zlib
|
||||
] ++ optionals withQt (with qt5; [ qtbase qtmultimedia qtsvg qttools ])
|
||||
++ optionals stdenv.isLinux [ libcap libnl ]
|
||||
++ optionals stdenv.isDarwin [ SystemConfiguration ApplicationServices gmp ]
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
{ stdenv, lib, fetchFromGitHub, autoconf, automake, libtool, makeWrapper
|
||||
, pkg-config, cmake, gnumake, yasm, python3Packages
|
||||
, libgcrypt, libgpgerror, libunistring
|
||||
, libgcrypt, libgpg-error, libunistring
|
||||
, boost, avahi, lame
|
||||
, gettext, pcre-cpp, yajl, fribidi, which
|
||||
, openssl, gperf, tinyxml2, taglib, libssh, swig, jre_headless
|
||||
|
@ -122,7 +122,7 @@ in stdenv.mkDerivation {
|
|||
sqlite libmysqlclient avahi lame
|
||||
curl bzip2 zip unzip glxinfo
|
||||
libcec libcec_platform dcadec libuuid
|
||||
libgcrypt libgpgerror libunistring
|
||||
libgcrypt libgpg-error libunistring
|
||||
libcrossguid libplist
|
||||
bluez giflib glib harfbuzz lcms2 libpthreadstubs
|
||||
ffmpeg flatbuffers fmt fstrcmp rapidjson
|
||||
|
|
|
@ -2,7 +2,7 @@
|
|||
, libarchive, perl, xorg, libdvdnav, libbluray
|
||||
, zlib, a52dec, libmad, faad2, ffmpeg, alsa-lib
|
||||
, pkg-config, dbus, fribidi, freefont_ttf, libebml, libmatroska
|
||||
, libvorbis, libtheora, speex, lua5, libgcrypt, libgpgerror, libupnp
|
||||
, libvorbis, libtheora, speex, lua5, libgcrypt, libgpg-error, libupnp
|
||||
, libcaca, libpulseaudio, flac, schroedinger, libxml2, librsvg
|
||||
, mpeg2dec, systemd, gnutls, avahi, libcddb, libjack2, SDL, SDL_image
|
||||
, libmtp, unzip, taglib, libkate, libtiger, libv4l, samba, libssh2, liboggz
|
||||
|
@ -37,7 +37,7 @@ stdenv.mkDerivation rec {
|
|||
# needing them
|
||||
buildInputs = [
|
||||
zlib a52dec libmad faad2 ffmpeg alsa-lib libdvdnav libdvdnav.libdvdread
|
||||
libbluray dbus fribidi libvorbis libtheora speex lua5 libgcrypt libgpgerror
|
||||
libbluray dbus fribidi libvorbis libtheora speex lua5 libgcrypt libgpg-error
|
||||
libupnp libcaca libpulseaudio flac schroedinger libxml2 librsvg mpeg2dec
|
||||
systemd gnutls avahi libcddb SDL SDL_image libmtp taglib libarchive
|
||||
libkate libtiger libv4l samba libssh2 liboggz libass libdvbpsi libva
|
||||
|
|
|
@ -175,7 +175,7 @@ rec {
|
|||
|
||||
harfbuzz
|
||||
e2fsprogs
|
||||
libgpgerror
|
||||
libgpg-error
|
||||
keyutils.lib
|
||||
libjack2
|
||||
fribidi
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
{ lib, stdenv, fetchurl, gnutls, openssl, libgcrypt, libgpgerror, pkg-config, gettext
|
||||
{ lib, stdenv, fetchurl, gnutls, openssl, libgcrypt, libgpg-error, pkg-config, gettext
|
||||
, which
|
||||
|
||||
# GUI support
|
||||
|
@ -55,7 +55,7 @@ in stdenv.mkDerivation rec {
|
|||
|
||||
nativeBuildInputs = [ pkg-config gettext which ];
|
||||
|
||||
buildInputs = [ gtk2 gtk3 qt5.qtbase gnutls openssl libgcrypt libgpgerror ];
|
||||
buildInputs = [ gtk2 gtk3 qt5.qtbase gnutls openssl libgcrypt libgpg-error ];
|
||||
|
||||
dontWrapQtApps = true;
|
||||
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
{ lib, stdenv, fetchurl, pkg-config, glib, zlib, gnupg, libgpgerror, gobject-introspection }:
|
||||
{ lib, stdenv, fetchurl, pkg-config, glib, zlib, gnupg, libgpg-error, gobject-introspection }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "2.6.23";
|
||||
|
@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
|
|||
outputs = [ "out" "dev" ];
|
||||
|
||||
nativeBuildInputs = [ pkg-config gobject-introspection ];
|
||||
propagatedBuildInputs = [ glib zlib libgpgerror ];
|
||||
propagatedBuildInputs = [ glib zlib libgpg-error ];
|
||||
configureFlags = [ "--enable-introspection=yes" ];
|
||||
|
||||
postPatch = ''
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
{ lib, stdenv, fetchurl, libgcrypt, libgpgerror, bison, flex }:
|
||||
{ lib, stdenv, fetchurl, libgcrypt, libgpg-error, bison, flex }:
|
||||
|
||||
# library that allows libbluray to play AACS protected bluray disks
|
||||
# libaacs does not infringe DRM's right or copyright. See the legal page of the website for more info.
|
||||
|
@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
|
|||
sha256 = "11skjqjlldmbjkyxdcz4fmcn6y4p95r1xagbcnjy4ndnzf0l723d";
|
||||
};
|
||||
|
||||
buildInputs = [ libgcrypt libgpgerror ];
|
||||
buildInputs = [ libgcrypt libgpg-error ];
|
||||
|
||||
nativeBuildInputs = [ bison flex ];
|
||||
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
{ fetchurl, lib, stdenv, gettext, npth, libgpgerror, buildPackages }:
|
||||
{ fetchurl, lib, stdenv, gettext, npth, libgpg-error, buildPackages }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "libassuan";
|
||||
|
@ -16,14 +16,14 @@ stdenv.mkDerivation rec {
|
|||
buildInputs = [ npth gettext ];
|
||||
|
||||
configureFlags = [
|
||||
"--with-libgpg-error-prefix=${libgpgerror.dev}"
|
||||
"--with-libgpg-error-prefix=${libgpg-error.dev}"
|
||||
];
|
||||
|
||||
doCheck = true;
|
||||
|
||||
# Make sure includes are fixed for callers who don't use libassuan-config
|
||||
postInstall = ''
|
||||
sed -i 's,#include <gpg-error.h>,#include "${libgpgerror.dev}/include/gpg-error.h",g' $dev/include/assuan.h
|
||||
sed -i 's,#include <gpg-error.h>,#include "${libgpg-error.dev}/include/gpg-error.h",g' $dev/include/assuan.h
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
{ lib, stdenv, fetchurl, libgcrypt, libgpgerror, gettext }:
|
||||
{ lib, stdenv, fetchurl, libgcrypt, libgpg-error, gettext }:
|
||||
|
||||
# library that allows libbluray to play BDplus protected bluray disks
|
||||
# libaacs does not infringe DRM's right or copyright. See the legal page of the website for more info.
|
||||
|
@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
|
|||
sha256 = "02n87lysqn4kg2qk7d1ffrp96c44zkdlxdj0n16hbgrlrpiwlcd6";
|
||||
};
|
||||
|
||||
buildInputs = [ libgcrypt libgpgerror gettext ];
|
||||
buildInputs = [ libgcrypt libgpg-error gettext ];
|
||||
|
||||
nativeBuildInputs = [ ];
|
||||
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
{ lib, stdenv, fetchpatch, fetchurl, libgpgerror, enableCapabilities ? false, libcap }:
|
||||
{ lib, stdenv, fetchpatch, fetchurl, libgpg-error, enableCapabilities ? false, libcap }:
|
||||
|
||||
assert enableCapabilities -> stdenv.isLinux;
|
||||
|
||||
|
@ -19,13 +19,13 @@ stdenv.mkDerivation rec {
|
|||
];
|
||||
|
||||
buildInputs =
|
||||
[ libgpgerror ]
|
||||
[ libgpg-error ]
|
||||
++ lib.optional enableCapabilities libcap;
|
||||
|
||||
# Make sure libraries are correct for .pc and .la files
|
||||
# Also make sure includes are fixed for callers who don't use libgpgcrypt-config
|
||||
postInstall = ''
|
||||
sed -i 's,#include <gpg-error.h>,#include "${libgpgerror.dev}/include/gpg-error.h",g' $out/include/gcrypt.h
|
||||
sed -i 's,#include <gpg-error.h>,#include "${libgpg-error.dev}/include/gpg-error.h",g' $out/include/gcrypt.h
|
||||
'' + lib.optionalString enableCapabilities ''
|
||||
sed -i 's,\(-lcap\),-L${libcap.lib}/lib \1,' $out/lib/libgcrypt.la
|
||||
'';
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
{ lib, stdenv, fetchurl, gettext, libgpgerror, enableCapabilities ? false, libcap, buildPackages }:
|
||||
{ lib, stdenv, fetchurl, gettext, libgpg-error, enableCapabilities ? false, libcap, buildPackages }:
|
||||
|
||||
assert enableCapabilities -> stdenv.isLinux;
|
||||
|
||||
|
@ -21,13 +21,13 @@ stdenv.mkDerivation rec {
|
|||
|
||||
depsBuildBuild = [ buildPackages.stdenv.cc ];
|
||||
|
||||
buildInputs = [ libgpgerror ]
|
||||
buildInputs = [ libgpg-error ]
|
||||
++ lib.optional stdenv.isDarwin gettext
|
||||
++ lib.optional enableCapabilities libcap;
|
||||
|
||||
strictDeps = true;
|
||||
|
||||
configureFlags = [ "--with-libgpg-error-prefix=${libgpgerror.dev}" ]
|
||||
configureFlags = [ "--with-libgpg-error-prefix=${libgpg-error.dev}" ]
|
||||
++ lib.optional (stdenv.hostPlatform.isMusl || (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64)) "--disable-asm"; # for darwin see https://dev.gnupg.org/T5157
|
||||
|
||||
# Necessary to generate correct assembly when compiling for aarch32 on
|
||||
|
@ -42,7 +42,7 @@ stdenv.mkDerivation rec {
|
|||
# Make sure libraries are correct for .pc and .la files
|
||||
# Also make sure includes are fixed for callers who don't use libgpgcrypt-config
|
||||
postFixup = ''
|
||||
sed -i 's,#include <gpg-error.h>,#include "${libgpgerror.dev}/include/gpg-error.h",g' "$dev/include/gcrypt.h"
|
||||
sed -i 's,#include <gpg-error.h>,#include "${libgpg-error.dev}/include/gpg-error.h",g' "$dev/include/gcrypt.h"
|
||||
'' + lib.optionalString enableCapabilities ''
|
||||
sed -i 's,\(-lcap\),-L${libcap.lib}/lib \1,' $out/lib/libgcrypt.la
|
||||
'';
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
{ buildPackages, lib, stdenv, fetchurl, gettext, libgpgerror }:
|
||||
{ buildPackages, lib, stdenv, fetchurl, gettext, libgpg-error }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "libksba-1.5.1";
|
||||
|
@ -11,10 +11,10 @@ stdenv.mkDerivation rec {
|
|||
outputs = [ "out" "dev" "info" ];
|
||||
|
||||
buildInputs = [ gettext ];
|
||||
propagatedBuildInputs = [ libgpgerror ];
|
||||
propagatedBuildInputs = [ libgpg-error ];
|
||||
depsBuildBuild = [ buildPackages.stdenv.cc ];
|
||||
|
||||
configureFlags = [ "--with-libgpg-error-prefix=${libgpgerror.dev}" ];
|
||||
configureFlags = [ "--with-libgpg-error-prefix=${libgpg-error.dev}" ];
|
||||
|
||||
postInstall = ''
|
||||
mkdir -p $dev/bin
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
{ lib, stdenv, fetchurl, gettext, libgpgerror, libgcrypt, libksba, zlib }:
|
||||
{ lib, stdenv, fetchurl, gettext, libgpg-error, libgcrypt, libksba, zlib }:
|
||||
|
||||
with lib;
|
||||
|
||||
|
@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
|
|||
|
||||
outputs = [ "dev" "out" ];
|
||||
|
||||
buildInputs = [ libgcrypt libgpgerror libksba zlib ]
|
||||
buildInputs = [ libgcrypt libgpg-error libksba zlib ]
|
||||
++ lib.optional stdenv.isDarwin gettext;
|
||||
|
||||
postInstall = ''
|
||||
|
|
|
@ -4,7 +4,7 @@
|
|||
|
||||
let
|
||||
overridePkgs = lib.optionals (!runtimeOnly) (with pkgs; [
|
||||
libgpgerror
|
||||
libgpg-error
|
||||
libpulseaudio
|
||||
alsa-lib
|
||||
openalSoft
|
||||
|
|
|
@ -32,7 +32,7 @@
|
|||
, acl
|
||||
, lz4
|
||||
, libgcrypt
|
||||
, libgpgerror
|
||||
, libgpg-error
|
||||
, libidn2
|
||||
, curl
|
||||
, gnutar
|
||||
|
@ -105,7 +105,7 @@
|
|||
, docbook_xml_dtd_45
|
||||
}:
|
||||
|
||||
assert withResolved -> (libgcrypt != null && libgpgerror != null);
|
||||
assert withResolved -> (libgcrypt != null && libgpg-error != null);
|
||||
assert withImportd ->
|
||||
(curl.dev != null && zlib != null && xz != null && libgcrypt != null
|
||||
&& gnutar != null && gnupg != null && withCompression);
|
||||
|
@ -347,7 +347,7 @@ stdenv.mkDerivation {
|
|||
++ lib.optional withLibseccomp libseccomp
|
||||
++ lib.optional withNetworkd iptables
|
||||
++ lib.optional withPCRE2 pcre2
|
||||
++ lib.optional withResolved libgpgerror
|
||||
++ lib.optional withResolved libgpg-error
|
||||
++ lib.optional withSelinux libselinux
|
||||
++ lib.optional withRemote libmicrohttpd
|
||||
++ lib.optionals withHomed [ p11-kit ]
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
{ lib, stdenv, fetchurl, pkg-config
|
||||
, libgcrypt, libgpgerror, libtasn1
|
||||
, libgcrypt, libgpg-error, libtasn1
|
||||
|
||||
# Optional Dependencies
|
||||
, pam ? null, libidn ? null, gnutls ? null
|
||||
|
@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
|
|||
patches = [ ./gcrypt-fix.patch ./freebsd-unistd.patch ];
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
buildInputs = [ libgcrypt libgpgerror libtasn1 optPam optLibidn optGnutls ];
|
||||
buildInputs = [ libgcrypt libgpg-error libtasn1 optPam optLibidn optGnutls ];
|
||||
|
||||
configureFlags = [
|
||||
(mkOther "sysconfdir" "/etc")
|
||||
|
@ -68,7 +68,7 @@ stdenv.mkDerivation rec {
|
|||
-e 's,\(-lgnutls\),-L${optGnutls.out}/lib \1,' \
|
||||
'' + ''
|
||||
-e 's,\(-lgcrypt\),-L${libgcrypt.out}/lib \1,' \
|
||||
-e 's,\(-lgpg-error\),-L${libgpgerror.out}/lib \1,' \
|
||||
-e 's,\(-lgpg-error\),-L${libgpg-error.out}/lib \1,' \
|
||||
-e 's,\(-ltasn1\),-L${libtasn1.out}/lib \1,'
|
||||
'';
|
||||
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config
|
||||
, zlib, bzip2, lzo, lz4, zstd, xz
|
||||
, libgcrypt, e2fsprogs, util-linux, libgpgerror }:
|
||||
, libgcrypt, e2fsprogs, util-linux, libgpg-error }:
|
||||
|
||||
let
|
||||
version = "0.8.6";
|
||||
|
@ -22,7 +22,7 @@ in stdenv.mkDerivation {
|
|||
|
||||
buildInputs = [
|
||||
zlib bzip2 xz lzo lz4 zstd xz
|
||||
libgcrypt e2fsprogs util-linux libgpgerror
|
||||
libgcrypt e2fsprogs util-linux libgpg-error
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
{ lib, stdenv, fetchFromGitHub, bison, boost, cmake, makeWrapper, pkg-config
|
||||
, curl, cyrus_sasl, libaio, libedit, libev, libevent, libgcrypt, libgpgerror, lz4
|
||||
, curl, cyrus_sasl, libaio, libedit, libev, libevent, libgcrypt, libgpg-error, lz4
|
||||
, ncurses, numactl, openssl, protobuf, valgrind, xxd, zlib
|
||||
, perlPackages
|
||||
, version, sha256, extraPatches ? [], extraPostInstall ? "", ...
|
||||
|
@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
|
|||
nativeBuildInputs = [ bison boost cmake makeWrapper pkg-config ];
|
||||
|
||||
buildInputs = [
|
||||
curl cyrus_sasl libaio libedit libev libevent libgcrypt libgpgerror lz4
|
||||
curl cyrus_sasl libaio libedit libev libevent libgcrypt libgpg-error lz4
|
||||
ncurses numactl openssl protobuf valgrind xxd zlib
|
||||
] ++ (with perlPackages; [ perl DBI DBDmysql ]);
|
||||
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
{ lib, stdenv, fetchurl, libgpgerror, libgcrypt, libassuan, libksba, pth, openldap
|
||||
{ lib, stdenv, fetchurl, libgpg-error, libgcrypt, libassuan, libksba, pth, openldap
|
||||
, libiconv}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
|
@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
|
|||
url = "mirror://gnupg/dirmngr/dirmngr-${version}.tar.bz2";
|
||||
sha256 = "1zz6m87ca55nq5f59hzm6qs48d37h93il881y7d0rf2d6660na6j";
|
||||
};
|
||||
buildInputs = [ libgpgerror libgcrypt libassuan libksba
|
||||
buildInputs = [ libgpg-error libgcrypt libassuan libksba
|
||||
pth openldap libiconv ];
|
||||
|
||||
meta = {
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
{ lib, stdenv, fetchurl, libgpgerror, libassuan, libgcrypt, pkcs11helper,
|
||||
{ lib, stdenv, fetchurl, libgpg-error, libassuan, libgcrypt, pkcs11helper,
|
||||
pkg-config, openssl }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
|
@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
|
|||
buildInputs = [ pkcs11helper pkg-config openssl ];
|
||||
|
||||
configureFlags = [
|
||||
"--with-libgpg-error-prefix=${libgpgerror.dev}"
|
||||
"--with-libgpg-error-prefix=${libgpg-error.dev}"
|
||||
"--with-libassuan-prefix=${libassuan.dev}"
|
||||
"--with-libgcrypt-prefix=${libgcrypt.dev}"
|
||||
];
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
{ fetchurl, fetchpatch, lib, stdenv, pkg-config, libgcrypt, libassuan, libksba
|
||||
, libgpgerror, libiconv, npth, gettext, texinfo, buildPackages
|
||||
, libgpg-error, libiconv, npth, gettext, texinfo, buildPackages
|
||||
|
||||
# Each of the dependencies below are optional.
|
||||
# Gnupg can be built without them at the cost of reduced functionality.
|
||||
|
@ -48,7 +48,7 @@ stdenv.mkDerivation rec {
|
|||
|
||||
pinentryBinaryPath = pinentry.binaryPath or "bin/pinentry";
|
||||
configureFlags = [
|
||||
"--with-libgpg-error-prefix=${libgpgerror.dev}"
|
||||
"--with-libgpg-error-prefix=${libgpg-error.dev}"
|
||||
"--with-libgcrypt-prefix=${libgcrypt.dev}"
|
||||
"--with-libassuan-prefix=${libassuan.dev}"
|
||||
"--with-ksba-prefix=${libksba.dev}"
|
||||
|
|
|
@ -3,7 +3,7 @@
|
|||
, rustPlatform
|
||||
, fetchFromGitHub
|
||||
, gpgme
|
||||
, libgpgerror
|
||||
, libgpg-error
|
||||
, libxcb
|
||||
, libxkbcommon
|
||||
, python3
|
||||
|
@ -29,13 +29,13 @@ rustPlatform.buildRustPackage rec {
|
|||
|
||||
nativeBuildInputs = [
|
||||
gpgme # for gpgme-config
|
||||
libgpgerror # for gpg-error-config
|
||||
libgpg-error # for gpg-error-config
|
||||
python3
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
gpgme
|
||||
libgpgerror
|
||||
libgpg-error
|
||||
libxcb
|
||||
libxkbcommon
|
||||
] ++ lib.optionals stdenv.isDarwin [
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
{ fetchurl, mkDerivation, fetchpatch, stdenv, lib, pkg-config, autoreconfHook, wrapGAppsHook
|
||||
, libgpgerror, libassuan, qtbase, wrapQtAppsHook
|
||||
, libgpg-error, libassuan, qtbase, wrapQtAppsHook
|
||||
, ncurses, gtk2, gcr
|
||||
, libcap ? null, libsecret ? null
|
||||
, enabledFlavors ? [ "curses" "tty" "gtk2" "emacs" ]
|
||||
|
@ -52,7 +52,7 @@ pinentryMkDerivation rec {
|
|||
|
||||
nativeBuildInputs = [ pkg-config autoreconfHook ]
|
||||
++ concatMap(f: flavorInfo.${f}.nativeBuildInputs or []) enabledFlavors;
|
||||
buildInputs = [ libgpgerror libassuan libcap libsecret ]
|
||||
buildInputs = [ libgpg-error libassuan libcap libsecret ]
|
||||
++ concatMap(f: flavorInfo.${f}.buildInputs or []) enabledFlavors;
|
||||
|
||||
dontWrapGApps = true;
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
{ stdenv, lib, rustPlatform, fetchFromGitHub, pkg-config, ncurses, python3, openssl, libgpgerror, gpgme, xorg, AppKit, Security, installShellFiles }:
|
||||
{ stdenv, lib, rustPlatform, fetchFromGitHub, pkg-config, ncurses, python3, openssl, libgpg-error, gpgme, xorg, AppKit, Security, installShellFiles }:
|
||||
|
||||
with rustPlatform;
|
||||
buildRustPackage rec {
|
||||
|
@ -20,7 +20,7 @@ buildRustPackage rec {
|
|||
|
||||
nativeBuildInputs = [ pkg-config gpgme python3 installShellFiles ];
|
||||
buildInputs = [
|
||||
ncurses openssl libgpgerror gpgme xorg.libxcb
|
||||
ncurses openssl libgpg-error gpgme xorg.libxcb
|
||||
] ++ lib.optionals stdenv.isDarwin [ AppKit Security ];
|
||||
|
||||
preCheck = ''
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
{ lib, stdenv, rustPlatform, fetchCrate, installShellFiles
|
||||
, libgpgerror, gpgme, gettext, openssl, Security
|
||||
, libgpg-error, gpgme, gettext, openssl, Security
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
|
@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec {
|
|||
|
||||
cargoBuildFlags = [ "--bin sy" "--features" "vault,extract,completions,substitute,process" ];
|
||||
|
||||
nativeBuildInputs = [ libgpgerror gpgme gettext installShellFiles ];
|
||||
nativeBuildInputs = [ libgpg-error gpgme gettext installShellFiles ];
|
||||
|
||||
buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ Security ];
|
||||
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
{ fetchurl, lib, stdenv, libgcrypt, readline, libgpgerror }:
|
||||
{ fetchurl, lib, stdenv, libgcrypt, readline, libgpg-error }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "1.6.8";
|
||||
|
@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
|
|||
sha256 = "0w8af1i57szmxl9vfifwwyal7xh8aixz2l9487wvy6yckqk6m92a";
|
||||
};
|
||||
|
||||
buildInputs = [ libgcrypt readline libgpgerror ];
|
||||
buildInputs = [ libgcrypt readline libgpg-error ];
|
||||
|
||||
doCheck = true;
|
||||
|
||||
|
|
|
@ -422,6 +422,7 @@ mapAliases ({
|
|||
liberationsansnarrow = liberation-sans-narrow; # added 2018-12-12
|
||||
libgnome_keyring = libgnome-keyring; # added 2018-02-25
|
||||
libgnome_keyring3 = libgnome-keyring3; # added 2018-02-25
|
||||
libgpgerror = libgpg-error; # added 2021-09-04
|
||||
libgumbo = gumbo; # added 2018-01-21
|
||||
libGL_driver = mesa.drivers; # added 2019-05-28
|
||||
libintlOrEmpty = lib.optional (!stdenv.isLinux || stdenv.hostPlatform.libc != "glibc") gettext; # added 2018-03-14
|
||||
|
|
|
@ -17314,10 +17314,10 @@ with pkgs;
|
|||
|
||||
libgnt = callPackage ../development/libraries/libgnt { };
|
||||
|
||||
libgpgerror = callPackage ../development/libraries/libgpg-error { };
|
||||
libgpg-error = callPackage ../development/libraries/libgpg-error { };
|
||||
|
||||
# https://git.gnupg.org/cgi-bin/gitweb.cgi?p=libgpg-error.git;a=blob;f=README;h=fd6e1a83f55696c1f7a08f6dfca08b2d6b7617ec;hb=70058cd9f944d620764e57c838209afae8a58c78#l118
|
||||
libgpgerror-gen-posix-lock-obj = libgpgerror.override {
|
||||
libgpg-error-gen-posix-lock-obj = libgpg-error.override {
|
||||
genPosixLockObjOnly = true;
|
||||
};
|
||||
|
||||
|
|
Loading…
Reference in a new issue