about summary refs log tree commit diff
diff options
context:
space:
mode:
authorLudovic Courtès <ludo@gnu.org>2010-05-20 13:00:30 +0000
committerLudovic Courtès <ludo@gnu.org>2010-05-20 13:00:30 +0000
commit1fe9b4a3b1f5f8475e0f6c51d232d525fa03b29f (patch)
tree924d8aa4a34ac30094a1e98ac029bf03f8005c69
parentb93b157771b7f990a1146ca465057e0542cd40ba (diff)
downloadnixlib-1fe9b4a3b1f5f8475e0f6c51d232d525fa03b29f.tar
nixlib-1fe9b4a3b1f5f8475e0f6c51d232d525fa03b29f.tar.gz
nixlib-1fe9b4a3b1f5f8475e0f6c51d232d525fa03b29f.tar.bz2
nixlib-1fe9b4a3b1f5f8475e0f6c51d232d525fa03b29f.tar.lz
nixlib-1fe9b4a3b1f5f8475e0f6c51d232d525fa03b29f.tar.xz
nixlib-1fe9b4a3b1f5f8475e0f6c51d232d525fa03b29f.tar.zst
nixlib-1fe9b4a3b1f5f8475e0f6c51d232d525fa03b29f.zip
GNU GSS: Add dependency on GNU Shishi.
svn path=/nixpkgs/trunk/; revision=21922
-rw-r--r--pkgs/development/libraries/gss/default.nix14
-rw-r--r--pkgs/top-level/all-packages.nix2
2 files changed, 11 insertions, 5 deletions
diff --git a/pkgs/development/libraries/gss/default.nix b/pkgs/development/libraries/gss/default.nix
index bf47c79f7506..ca92fe307980 100644
--- a/pkgs/development/libraries/gss/default.nix
+++ b/pkgs/development/libraries/gss/default.nix
@@ -1,4 +1,4 @@
-{ fetchurl, stdenv }:
+{ fetchurl, stdenv, shishi }:
 
 stdenv.mkDerivation rec {
   name = "gss-1.0.0";
@@ -8,16 +8,22 @@ stdenv.mkDerivation rec {
     sha256 = "0rcbzg19m7bddvbhjqv1iwyydkj61czb0xr691mkj0i5p4d4bakk";
   };
 
+  buildInputs = [ shishi ];
+
   doCheck = true;
 
+  # Work around the lack of `-lshishi' for `krb5context'.  See
+  # <http://lists.gnu.org/archive/html/help-gsasl/2010-05/msg00005.html>.
+  checkPhase = "make check LDFLAGS=-lshishi";
+
   meta = {
     description = "GNU GSS Generic Security Service";
 
     longDescription =
       '' GSS is an implementation of the Generic Security Service Application
-         Program Interface (GSS-API). GSS-API is used by network servers to 
-         provide security services, e.g., to authenticate SMTP/IMAP clients 
-         against SMTP/IMAP servers. 
+	 Program Interface (GSS-API). GSS-API is used by network servers to
+	 provide security services, e.g., to authenticate SMTP/IMAP clients
+	 against SMTP/IMAP servers.
        '';
 
     homepage = http://www.gnu.org/software/gss/;
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 57465b0ea02f..94cb6ce92194 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4064,7 +4064,7 @@ let
   };
 
   gss = import ../development/libraries/gss {
-    inherit stdenv fetchurl;
+    inherit stdenv fetchurl shishi;
   };
 
   gtkimageview = import ../development/libraries/gtkimageview {