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

pytest: add selenium option, fix selenium build on darwin

Browse Source
This commit is contained in:
Jason "Don" O'Conal 2013-09-24 16:59:51 +10:00
parent 63f06c6c02
commit 0840cc3a24
1 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
pkgs/top-level/python-packages.nix
View File

@ -1074,10 +1074,14 @@ pythonPackages = modules // import ./python-packages-generated.nix {
md5 = "18f150e7be96b5fe3c388b0e817b8087"; md5 = "18f150e7be96b5fe3c388b0e817b8087";
}; };
propagatedBuildInputs = [ pythonPackages.py ]; propagatedBuildInputs = [ pythonPackages.py ]
++ stdenv.lib.optional
pkgs.config.pythonPackages.pytest.selenium
pythonPackages.selenium;
meta = { meta = with stdenv.lib; {
maintainers = [ stdenv.lib.maintainers.iElectric ]; maintainers = with maintainers; [ iElectric lovek323 ];
platforms = platforms.unix;
}; };
}; };
@ -5341,7 +5345,11 @@ pythonPackages = modules // import ./python-packages-generated.nix {
cp "${x_ignore_nofocus}/"* . cp "${x_ignore_nofocus}/"* .
sed -i 's|dlopen(library,|dlopen("libX11.so.6",|' x_ignore_nofocus.c sed -i 's|dlopen(library,|dlopen("libX11.so.6",|' x_ignore_nofocus.c
gcc -c -fPIC x_ignore_nofocus.c -o x_ignore_nofocus.o gcc -c -fPIC x_ignore_nofocus.c -o x_ignore_nofocus.o
gcc -shared -Wl,-soname,x_ignore_nofocus.so -o x_ignore_nofocus.so x_ignore_nofocus.o gcc -shared \
-Wl,${if stdenv.isDarwin then "-install_name" else "-soname"},x_ignore_nofocus.so \
-o x_ignore_nofocus.so \
x_ignore_nofocus.o \
${if stdenv.isDarwin then "-lx11" else ""}
cp -v x_ignore_nofocus.so py/selenium/webdriver/firefox/${if pkgs.stdenv.is64bit then "amd64" else "x86"}/ cp -v x_ignore_nofocus.so py/selenium/webdriver/firefox/${if pkgs.stdenv.is64bit then "amd64" else "x86"}/
''; '';
}; };