Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: ef48aaff73b5
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 98dcfed615f1
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Mar 16, 2019

  1. gnupg: use config flags to find lib prefix instead of their binary tools

    @illegalprime
    illegalprime committed Mar 16, 2019
    Copy the full SHA
    268f159 View commit details

Commits on Mar 26, 2019

  1. Merge pull request #57818 from illegalprime/fix/gnupg-cross 

    gnupg: use config flags to find lib prefix instead of their binary tools
    @peti
    peti authored Mar 26, 2019
    Copy the full SHA
    98dcfed View commit details
Showing with 10 additions and 2 deletions.
  1. +10 −2 pkgs/tools/security/gnupg/22.nix
12 changes: 10 additions & 2 deletions pkgs/tools/security/gnupg/22.nix
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
{ fetchurl, stdenv, pkgconfig, libgcrypt, libassuan, libksba
{ fetchurl, stdenv, pkgconfig, libgcrypt, libassuan, libksba, libgpgerror
, libiconv, npth, gettext, texinfo, pcsclite, sqlite
, buildPackages

# Each of the dependencies below are optional.
# Gnupg can be built without them at the cost of reduced functionality.
@@ -22,6 +23,7 @@ stdenv.mkDerivation rec {
sha256 = "0yzqrg24j9fc4f8ss5pclyvg70a9z53sv89vl77xii8yvi3fvy8v";
};

depsBuildBuild = [ buildPackages.stdenv.cc ];
nativeBuildInputs = [ pkgconfig ];
buildInputs = [
libgcrypt libassuan libksba libiconv npth gettext texinfo
@@ -36,7 +38,13 @@ stdenv.mkDerivation rec {
''; #" fix Emacs syntax highlighting :-(

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 = ''
mkdir -p $out/lib/systemd/user