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: 34bc84d5b855
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 69e23dcc666f
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Mar 21, 2019

  1. gpgme: cross compilation

    @illegalprime
    illegalprime committed Mar 21, 2019

    Verified

    This commit was signed with the committer’s verified signature.
    greg-1-anderson Greg Anderson
    GPG key ID: ED613886A7C8119A
    Verified
    Learn about vigilant mode
    Copy the full SHA
    aefea5f View commit details

Commits on Mar 22, 2019

  1. Merge pull request #58046 from illegalprime/gpgme-cross 

    gpgme: cross compilation
    @primeos
    primeos authored Mar 22, 2019
    Copy the full SHA
    69e23dc View commit details
Showing with 4 additions and 0 deletions.
  1. +4 −0 pkgs/development/libraries/gpgme/default.nix
4 changes: 4 additions & 0 deletions pkgs/development/libraries/gpgme/default.nix
View file
Original file line number Diff line number Diff line change
@@ -3,6 +3,7 @@
, autoreconfHook, fetchpatch
, git
, texinfo
, buildPackages
, qtbase ? null
, pythonSupport ? false, swig2 ? null, python ? null
}:
@@ -31,6 +32,8 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ file pkgconfig gnupg autoreconfHook git texinfo ]
++ lib.optionals pythonSupport [ python swig2 which ncurses ];

depsBuildBuild = [ buildPackages.stdenv.cc ];

patches = [
(fetchpatch {
name = "fix-key-expiry.patch";
@@ -46,6 +49,7 @@ stdenv.mkDerivation rec {
configureFlags = [
"--enable-fixed-path=${gnupg}/bin"
"--with-libgpg-error-prefix=${libgpgerror.dev}"
"--with-libassuan-prefix=${libassuan.dev}"
] ++ lib.optional pythonSupport "--enable-languages=python";

NIX_CFLAGS_COMPILE =