From 9534d10db63bca745cfdd34d18a56b4eceee7cba Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Sat, 24 Apr 2010 21:02:42 +0000 Subject: [PATCH] pwdutils: Use GnuTLS instead of OpenSSL. svn path=/nixpkgs/trunk/; revision=21300 --- pkgs/os-specific/linux/pwdutils/default.nix | 6 +++--- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/os-specific/linux/pwdutils/default.nix b/pkgs/os-specific/linux/pwdutils/default.nix index 906a51fc74ca..617368fa79ff 100644 --- a/pkgs/os-specific/linux/pwdutils/default.nix +++ b/pkgs/os-specific/linux/pwdutils/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, pam, openssl, libnscd}: +{ stdenv, fetchurl, pam, gnutls, libnscd }: stdenv.mkDerivation rec { name = "pwdutils-3.2.6"; @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "1pyawvv9x0hiachn1mb257s6hm92dh1ykczgp7ik8z6jl020z3n7"; }; - buildInputs = [pam openssl libnscd]; + buildInputs = [ pam gnutls libnscd ]; patchPhase = '' for i in src/tst-* @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { configurePhase = '' ./configure --prefix="$out" --exec-prefix="$out/bin" \ --libdir="$out/lib" --disable-static \ - --disable-ldap + --disable-ldap --enable-gnutls ''; # FIXME: The test suite seems to make assumptions that don't hold in Nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 22224a4daa57..625f133fcdc7 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6358,7 +6358,7 @@ let }; pwdutils = import ../os-specific/linux/pwdutils { - inherit fetchurl stdenv pam openssl libnscd; + inherit fetchurl stdenv pam gnutls libnscd; }; qemu_kvm = import ../os-specific/linux/qemu-kvm {