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

Merge pull request #10501 from adnelson/fix_ansible

Browse Source 
ansible: fix constants.py patching, do not propagate pythonpaths
This commit is contained in:
Domen Kožar 2015-11-22 10:13:00 +01:00
commit 47cb9d76d6
1 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkgs/tools/system/ansible/default.nix
View File

@ -11,7 +11,7 @@ pythonPackages.buildPythonPackage rec {
}; };
prePatch = '' prePatch = ''
sed -i "s,\/usr\/share\/ansible\/,$out/share/ansible," lib/ansible/constants.py sed -i "s,/usr/,$out," lib/ansible/constants.py
''; '';
doCheck = false; doCheck = false;
@ -19,14 +19,10 @@ pythonPackages.buildPythonPackage rec {
dontPatchELF = true; dontPatchELF = true;
dontPatchShebangs = true; dontPatchShebangs = true;
propagatedBuildInputs = with pythonPackages; [ pythonPath = with pythonPackages; [
paramiko jinja2 pyyaml httplib2 boto six paramiko jinja2 pyyaml httplib2 boto six
] ++ stdenv.lib.optional windowsSupport pywinrm; ] ++ stdenv.lib.optional windowsSupport pywinrm;
postFixup = ''
wrapPythonProgramsIn $out/bin "$out $pythonPath"
'';
meta = with stdenv.lib; { meta = with stdenv.lib; {
homepage = "http://www.ansible.com"; homepage = "http://www.ansible.com";
description = "A simple automation tool"; description = "A simple automation tool";