sssd: 2.6.0 -> 2.6.1, fix broken build
python2Packages.ldap fails to build since https://github.com/NixOS/nixpkgs/pull/149010 This PR drops python2 bindings for sssd.
This commit is contained in:
parent
32e3ee5193
commit
580952d787
|
@ -1,8 +1,8 @@
|
|||
{ lib, stdenv, fetchFromGitHub, autoreconfHook, glibc, augeas, dnsutils, c-ares, curl,
|
||||
cyrus_sasl, ding-libs, libnl, libunistring, nss, samba, nfs-utils, doxygen,
|
||||
python, python3, pam, popt, talloc, tdb, tevent, pkg-config, ldb, openldap,
|
||||
python3, pam, popt, talloc, tdb, tevent, pkg-config, ldb, openldap,
|
||||
pcre2, libkrb5, cifs-utils, glib, keyutils, dbus, fakeroot, libxslt, libxml2,
|
||||
libuuid, ldap, systemd, nspr, check, cmocka, uid_wrapper, p11-kit,
|
||||
libuuid, systemd, nspr, check, cmocka, uid_wrapper, p11-kit,
|
||||
nss_wrapper, ncurses, Po4a, http-parser, jansson,
|
||||
docbook_xsl, docbook_xml_dtd_44,
|
||||
withSudo ? false }:
|
||||
|
@ -12,13 +12,13 @@ let
|
|||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "sssd";
|
||||
version = "2.6.0";
|
||||
version = "2.6.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "SSSD";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "1ik0x0b7s38d7n0aqhl31r0asxw6qcdb31hx9qydk87yg3n6rziv";
|
||||
sha256 = "sha256-AcfNm/0VpjD+Aa1ZUwI2EI/i0s06rxQCfabv3a/AM38=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
|
|||
|
||||
preConfigure = ''
|
||||
export SGML_CATALOG_FILES="${docbookFiles}"
|
||||
export PYTHONPATH=${ldap}/lib/python2.7/site-packages
|
||||
export PYTHONPATH=$(find ${python3.pkgs.ldap} -type d -name site-packages)
|
||||
export PATH=$PATH:${openldap}/libexec
|
||||
|
||||
configureFlagsArray=(
|
||||
|
@ -40,7 +40,6 @@ stdenv.mkDerivation rec {
|
|||
--enable-pammoddir=$out/lib/security
|
||||
--with-os=fedora
|
||||
--with-pid-path=/run
|
||||
--with-python2-bindings
|
||||
--with-python3-bindings
|
||||
--with-syslog=journald
|
||||
--without-selinux
|
||||
|
@ -56,10 +55,10 @@ stdenv.mkDerivation rec {
|
|||
enableParallelBuilding = true;
|
||||
nativeBuildInputs = [ autoreconfHook pkg-config doxygen ];
|
||||
buildInputs = [ augeas dnsutils c-ares curl cyrus_sasl ding-libs libnl libunistring nss
|
||||
samba nfs-utils p11-kit python python3 popt
|
||||
samba nfs-utils p11-kit python3 popt
|
||||
talloc tdb tevent ldb pam openldap pcre2 libkrb5
|
||||
cifs-utils glib keyutils dbus fakeroot libxslt libxml2
|
||||
libuuid ldap systemd nspr check cmocka uid_wrapper
|
||||
libuuid python3.pkgs.ldap systemd nspr check cmocka uid_wrapper
|
||||
nss_wrapper ncurses Po4a http-parser jansson ];
|
||||
|
||||
makeFlags = [
|
||||
|
|
|
@ -10594,7 +10594,6 @@ with pkgs;
|
|||
|
||||
sssd = callPackage ../os-specific/linux/sssd {
|
||||
inherit (perlPackages) Po4a;
|
||||
inherit (python27Packages) ldap;
|
||||
};
|
||||
|
||||
sentry-cli = callPackage ../development/tools/sentry-cli {
|
||||
|
|
Loading…
Reference in a new issue