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: 5083c1d0bc94
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: d5ccec3c4e6d
Choose a head ref
  • 3 commits
  • 3 files changed
  • 1 contributor

Commits on Feb 5, 2018

  1. libksba: fix darwin build

    @LnL7
    LnL7 committed Feb 5, 2018
    Copy the full SHA
    d3b3827 View commit details

  2. libassuan: fix darwin build

    @LnL7
    LnL7 committed Feb 5, 2018
    1
    Copy the full SHA
    6f86808 View commit details

  3. libgcrypt: fix darwin build

    @LnL7
    LnL7 committed Feb 5, 2018
    Copy the full SHA
    d5ccec3 View commit details
Showing with 10 additions and 9 deletions.
  1. +6 −7 pkgs/development/libraries/libassuan/default.nix
  2. +2 −1 pkgs/development/libraries/libgcrypt/default.nix
  3. +2 −1 pkgs/development/libraries/libksba/default.nix
13 changes: 6 additions & 7 deletions pkgs/development/libraries/libassuan/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{ fetchurl, stdenv, pth, libgpgerror }:
{ fetchurl, stdenv, gettext, pth, libgpgerror }:

stdenv.mkDerivation rec {
name = "libassuan-2.5.1";
@@ -11,7 +11,8 @@ stdenv.mkDerivation rec {
outputs = [ "out" "dev" "info" ];
outputBin = "dev"; # libassuan-config

buildInputs = [ libgpgerror pth ];
buildInputs = [ libgpgerror pth ]
++ stdenv.lib.optional stdenv.isDarwin gettext;

doCheck = true;

@@ -20,18 +21,16 @@ stdenv.mkDerivation rec {
sed -i 's,#include <gpg-error.h>,#include "${libgpgerror.dev}/include/gpg-error.h",g' $dev/include/assuan.h
'';

meta = {
meta = with stdenv.lib; {
description = "IPC library used by GnuPG and related software";

longDescription = ''
Libassuan is a small library implementing the so-called Assuan
protocol. This protocol is used for IPC between most newer
GnuPG components. Both, server and client side functions are
provided.
'';

homepage = http://gnupg.org;
license = stdenv.lib.licenses.lgpl2Plus;
platforms = stdenv.lib.platforms.all;
license = licenses.lgpl2Plus;
platforms = platforms.all;
};
}
3 changes: 2 additions & 1 deletion pkgs/development/libraries/libgcrypt/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{ stdenv, fetchurl, libgpgerror, enableCapabilities ? false, libcap }:
{ stdenv, fetchurl, gettext, libgpgerror, enableCapabilities ? false, libcap }:

assert enableCapabilities -> stdenv.isLinux;

@@ -20,6 +20,7 @@ stdenv.mkDerivation rec {
hardeningDisable = stdenv.lib.optional stdenv.cc.isClang "fortify";

buildInputs = [ libgpgerror ]
++ stdenv.lib.optional stdenv.isDarwin gettext
++ stdenv.lib.optional enableCapabilities libcap;

# Make sure libraries are correct for .pc and .la files
3 changes: 2 additions & 1 deletion pkgs/development/libraries/libksba/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{ stdenv, fetchurl, libgpgerror }:
{ stdenv, fetchurl, gettext, libgpgerror }:

stdenv.mkDerivation rec {
name = "libksba-1.3.5";
@@ -10,6 +10,7 @@ stdenv.mkDerivation rec {

outputs = [ "out" "dev" "info" ];

buildInputs = stdenv.lib.optional stdenv.isDarwin gettext;
propagatedBuildInputs = [ libgpgerror ];

postInstall = ''