alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

Merge pull request #110107 from LeSuisse/cifs-utils-missing-python3-smbinfo

Browse source 
cifs-utils: missing python3 dependency for smbinfo
This commit is contained in:
Sandro 2021-01-20 20:12:37 +01:00 committed by GitHub
parent 88637a1c33 5858d84658
commit ec84cbf95f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 14 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
nixos/tests/cifs-utils.nix Normal file
View file

@ -0,0 +1,12 @@
import ./make-test-python.nix ({ pkgs, ... }: {
name = "cifs-utils";
machine = { pkgs, ... }: { environment.systemPackages = [ pkgs.cifs-utils ]; };
testScript = ''
machine.succeed("smbinfo -h")
machine.succeed("smb2-quota -h")
assert "${pkgs.cifs-utils.version}" in machine.succeed("cifs.upcall -v")
assert "${pkgs.cifs-utils.version}" in machine.succeed("mount.cifs -V")
'';
})

4
pkgs/os-specific/linux/cifs-utils/default.nix
View file

@ -1,5 +1,5 @@
{ stdenv, lib, fetchurl, autoreconfHook, docutils, pkg-config
, kerberos, keyutils, pam, talloc }:
, kerberos, keyutils, pam, talloc, python3 }:
stdenv.mkDerivation rec {
pname = "cifs-utils";
@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ autoreconfHook docutils pkg-config ];
buildInputs = [ kerberos keyutils pam talloc ];
buildInputs = [ kerberos keyutils pam talloc python3 ];
configureFlags = [ "ROOTSBINDIR=$(out)/sbin" ] ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [
# AC_FUNC_MALLOC is broken on cross builds.