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

Merge pull request #36971 from volth/no-pandoc-on-i686

Browse Source 
sshuttle: fix build on i686-linux
This commit is contained in:
Jörg Thalheim 2018-03-14 09:34:08 +00:00 committed by GitHub
commit 97c60ab34a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/tools/security/sshuttle/default.nix
View File

@ -18,7 +18,7 @@ python3Packages.buildPythonApplication rec {
}) })
]; ];
nativeBuildInputs = [ makeWrapper pandoc python3Packages.setuptools_scm ]; nativeBuildInputs = [ makeWrapper python3Packages.setuptools_scm ] ++ stdenv.lib.optional (stdenv.system != "i686-linux") pandoc;
buildInputs = buildInputs =
[ coreutils openssh ] ++ [ coreutils openssh ] ++
stdenv.lib.optionals stdenv.isLinux [ iptables nettools procps ]; stdenv.lib.optionals stdenv.isLinux [ iptables nettools procps ];
@ -29,6 +29,10 @@ python3Packages.buildPythonApplication rec {
# uses Python 3, so it should be fine. # uses Python 3, so it should be fine.
doCheck = true; doCheck = true;
checkPhase = ''
py.test -k "${stdenv.lib.optionalString stdenv.isDarwin "not test_parse_subnetport_ip6"}"
'';
postInstall = let postInstall = let
mapPath = f: x: stdenv.lib.concatStringsSep ":" (map f x); mapPath = f: x: stdenv.lib.concatStringsSep ":" (map f x);
in '' in ''