public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #132658 from Artturin/backport-132373-to-release-21.05

Browse Source 
[Backport release-21.05] samba4: add wrapPythonPrograms
This commit is contained in:
Artturi 2021-08-06 01:37:19 +03:00 committed by GitHub
commit 71102fbdab
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pkgs/servers/samba/4.x.nix
View File

@ -1,6 +1,5 @@
{ lib, stdenv { lib, stdenv
, fetchurl , fetchurl
, python
, pkg-config , pkg-config
, bison , bison
, flex , flex
@ -62,6 +61,7 @@ stdenv.mkDerivation rec {
]; ];
nativeBuildInputs = [ nativeBuildInputs = [
python3Packages.python
pkg-config pkg-config
bison bison
flex flex
@ -78,7 +78,8 @@ stdenv.mkDerivation rec {
]; ];
buildInputs = [ buildInputs = [
python python3Packages.python
python3Packages.wrapPython
readline readline
popt popt
dbus dbus
@ -128,6 +129,8 @@ stdenv.mkDerivation rec {
++ optional (!enableAcl) "--without-acl-support" ++ optional (!enableAcl) "--without-acl-support"
++ optional (!enablePam) "--without-pam"; ++ optional (!enablePam) "--without-pam";
pythonPath = [ python3Packages.dnspython tdb ];
preBuild = '' preBuild = ''
export MAKEFLAGS="-j $NIX_BUILD_CORES" export MAKEFLAGS="-j $NIX_BUILD_CORES"
''; '';
@ -146,6 +149,9 @@ stdenv.mkDerivation rec {
patchelf --shrink-rpath "\$BIN"; patchelf --shrink-rpath "\$BIN";
EOF EOF
find $out -type f -name \*.so -exec $SHELL -c "$SCRIPT" \; find $out -type f -name \*.so -exec $SHELL -c "$SCRIPT" \;
# Fix PYTHONPATH for some tools
wrapPythonPrograms
''; '';
passthru = { passthru = {

1
pkgs/top-level/all-packages.nix
View File

@ -19702,7 +19702,6 @@ in
samba4 = callPackage ../servers/samba/4.x.nix { samba4 = callPackage ../servers/samba/4.x.nix {
rpcgen = netbsd.rpcgen; rpcgen = netbsd.rpcgen;
python = python3;
}; };
samba = samba4; samba = samba4;