Merge pull request #208795 from wucke13/dev/wucke13/fix-sssd
This commit is contained in:
commit
7b2a482ea0
|
@ -16,11 +16,11 @@
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "ldb";
|
pname = "ldb";
|
||||||
version = "2.3.0";
|
version = "2.6.1";
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "mirror://samba/ldb/${pname}-${version}.tar.gz";
|
url = "mirror://samba/ldb/${pname}-${version}.tar.gz";
|
||||||
sha256 = "0bcjj4gv48ddg44wyxpsvrs26xry6yy9x9k16qgz0bljs2rhilx4";
|
sha256 = "sha256-RnQD9334Z4LDlluxdUQLqi7XUan+uVYBlL2MBr8XNsk=";
|
||||||
};
|
};
|
||||||
|
|
||||||
outputs = [ "out" "dev" ];
|
outputs = [ "out" "dev" ];
|
||||||
|
@ -44,6 +44,13 @@ stdenv.mkDerivation rec {
|
||||||
cmocka
|
cmocka
|
||||||
];
|
];
|
||||||
|
|
||||||
|
# otherwise the configure script fails with
|
||||||
|
# PYTHONHASHSEED=1 missing! Don't use waf directly, use ./configure and make!
|
||||||
|
preConfigure = ''
|
||||||
|
export PKGCONFIG="$PKG_CONFIG"
|
||||||
|
export PYTHONHASHSEED=1
|
||||||
|
'';
|
||||||
|
|
||||||
wafPath = "buildtools/bin/waf";
|
wafPath = "buildtools/bin/waf";
|
||||||
|
|
||||||
wafConfigureFlags = [
|
wafConfigureFlags = [
|
||||||
|
|
|
@ -13,11 +13,11 @@
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "talloc";
|
pname = "talloc";
|
||||||
version = "2.3.3";
|
version = "2.3.4";
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "mirror://samba/talloc/${pname}-${version}.tar.gz";
|
url = "mirror://samba/talloc/${pname}-${version}.tar.gz";
|
||||||
sha256 = "sha256-a+lbI2i9CvHEzXqIFG62zuoY5Gw//JMwv2JitA0diqo=";
|
sha256 = "sha256-F5+eviZeZ+SrLCbK0rfeS2p3xsIS+WaQM4KGnwa+ZQU=";
|
||||||
};
|
};
|
||||||
|
|
||||||
nativeBuildInputs = [
|
nativeBuildInputs = [
|
||||||
|
@ -37,6 +37,13 @@ stdenv.mkDerivation rec {
|
||||||
libxcrypt
|
libxcrypt
|
||||||
];
|
];
|
||||||
|
|
||||||
|
# otherwise the configure script fails with
|
||||||
|
# PYTHONHASHSEED=1 missing! Don't use waf directly, use ./configure and make!
|
||||||
|
preConfigure = ''
|
||||||
|
export PKGCONFIG="$PKG_CONFIG"
|
||||||
|
export PYTHONHASHSEED=1
|
||||||
|
'';
|
||||||
|
|
||||||
wafPath = "buildtools/bin/waf";
|
wafPath = "buildtools/bin/waf";
|
||||||
|
|
||||||
wafConfigureFlags = [
|
wafConfigureFlags = [
|
||||||
|
|
|
@ -12,11 +12,11 @@
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "tdb";
|
pname = "tdb";
|
||||||
version = "1.4.6";
|
version = "1.4.7";
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "mirror://samba/tdb/${pname}-${version}.tar.gz";
|
url = "mirror://samba/tdb/${pname}-${version}.tar.gz";
|
||||||
sha256 = "sha256-1okr2L7+BKd2QqHdVuSoeTSb8c9bLAv1+4QQYZON7ws=";
|
sha256 = "sha256-pPsWje9TPzH/LAf32YRLsxMeZ5nwlOvnfQOArcmHwg4=";
|
||||||
};
|
};
|
||||||
|
|
||||||
nativeBuildInputs = [
|
nativeBuildInputs = [
|
||||||
|
@ -34,6 +34,13 @@ stdenv.mkDerivation rec {
|
||||||
libxcrypt
|
libxcrypt
|
||||||
];
|
];
|
||||||
|
|
||||||
|
# otherwise the configure script fails with
|
||||||
|
# PYTHONHASHSEED=1 missing! Don't use waf directly, use ./configure and make!
|
||||||
|
preConfigure = ''
|
||||||
|
export PKGCONFIG="$PKG_CONFIG"
|
||||||
|
export PYTHONHASHSEED=1
|
||||||
|
'';
|
||||||
|
|
||||||
wafPath = "buildtools/bin/waf";
|
wafPath = "buildtools/bin/waf";
|
||||||
|
|
||||||
wafConfigureFlags = [
|
wafConfigureFlags = [
|
||||||
|
|
|
@ -2,6 +2,7 @@
|
||||||
, fetchurl
|
, fetchurl
|
||||||
, python3
|
, python3
|
||||||
, pkg-config
|
, pkg-config
|
||||||
|
, cmocka
|
||||||
, readline
|
, readline
|
||||||
, talloc
|
, talloc
|
||||||
, libxslt
|
, libxslt
|
||||||
|
@ -13,11 +14,11 @@
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "tevent";
|
pname = "tevent";
|
||||||
version = "0.10.2";
|
version = "0.13.0";
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "mirror://samba/tevent/${pname}-${version}.tar.gz";
|
url = "mirror://samba/tevent/${pname}-${version}.tar.gz";
|
||||||
sha256 = "15k6i8ad5lpxfjsjyq9h64zlyws8d3cm0vwdnaw8z1xjwli7hhpq";
|
sha256 = "sha256-uUN6kX+lU0Q2G+tk7J4AQumcroh5iCpi3Tj2q+I3HQw=";
|
||||||
};
|
};
|
||||||
|
|
||||||
nativeBuildInputs = [
|
nativeBuildInputs = [
|
||||||
|
@ -32,10 +33,18 @@ stdenv.mkDerivation rec {
|
||||||
|
|
||||||
buildInputs = [
|
buildInputs = [
|
||||||
python3
|
python3
|
||||||
|
cmocka
|
||||||
readline # required to build python
|
readline # required to build python
|
||||||
talloc
|
talloc
|
||||||
];
|
];
|
||||||
|
|
||||||
|
# otherwise the configure script fails with
|
||||||
|
# PYTHONHASHSEED=1 missing! Don't use waf directly, use ./configure and make!
|
||||||
|
preConfigure = ''
|
||||||
|
export PKGCONFIG="$PKG_CONFIG"
|
||||||
|
export PYTHONHASHSEED=1
|
||||||
|
'';
|
||||||
|
|
||||||
wafPath = "buildtools/bin/waf";
|
wafPath = "buildtools/bin/waf";
|
||||||
|
|
||||||
wafConfigureFlags = [
|
wafConfigureFlags = [
|
||||||
|
|
|
@ -20,9 +20,12 @@
|
||||||
, gnutls
|
, gnutls
|
||||||
, systemd
|
, systemd
|
||||||
, samba
|
, samba
|
||||||
|
, talloc
|
||||||
, jansson
|
, jansson
|
||||||
|
, ldb
|
||||||
, libtasn1
|
, libtasn1
|
||||||
, tdb
|
, tdb
|
||||||
|
, tevent
|
||||||
, libxcrypt
|
, libxcrypt
|
||||||
, cmocka
|
, cmocka
|
||||||
, rpcsvc-proto
|
, rpcsvc-proto
|
||||||
|
@ -100,8 +103,11 @@ stdenv.mkDerivation rec {
|
||||||
libarchive
|
libarchive
|
||||||
zlib
|
zlib
|
||||||
gnutls
|
gnutls
|
||||||
|
ldb
|
||||||
|
talloc
|
||||||
libtasn1
|
libtasn1
|
||||||
tdb
|
tdb
|
||||||
|
tevent
|
||||||
libxcrypt
|
libxcrypt
|
||||||
] ++ optionals stdenv.isLinux [ liburing systemd ]
|
] ++ optionals stdenv.isLinux [ liburing systemd ]
|
||||||
++ optionals stdenv.isDarwin [ libiconv ]
|
++ optionals stdenv.isDarwin [ libiconv ]
|
||||||
|
@ -143,6 +149,7 @@ stdenv.mkDerivation rec {
|
||||||
++ optionals (!enableLDAP) [
|
++ optionals (!enableLDAP) [
|
||||||
"--without-ldap"
|
"--without-ldap"
|
||||||
"--without-ads"
|
"--without-ads"
|
||||||
|
"--bundled-libraries=!ldb,!pyldb-util!talloc,!pytalloc-util,!tevent,!tdb,!pytdb"
|
||||||
] ++ optional enableLibunwind "--with-libunwind"
|
] ++ optional enableLibunwind "--with-libunwind"
|
||||||
++ optional enableProfiling "--with-profiling-data"
|
++ optional enableProfiling "--with-profiling-data"
|
||||||
++ optional (!enableAcl) "--without-acl-support"
|
++ optional (!enableAcl) "--without-acl-support"
|
||||||
|
|
Loading…
Reference in a new issue