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

[Backport release-21.05] chromedriver: add dbus to libraries, correct LD_LIBRARY_PATH wrapping (#139838)

Browse Source 
* chromedriver: add dbus to libraries

It is apparently required since version 94.

Fixes issue #139547

(cherry picked from commit 433b2bc44487c90c33cb58d87434a287e6d43b15)

* chromedriver: remove extraneous LD_LIBRARY_PATH in wrapProgram

wrapProgram already prepends passed value to the specified environment
variable; no need to specify it explicitly.

(cherry picked from commit 38ddfe7f3ff206888806302539def70b80ef427b)

* chromedriver: add a package test checking the reported version

(cherry picked from commit 1106f4bafc0b444384c171c63ca78b8b6676842e)

* Update pkgs/development/tools/selenium/chromedriver/default.nix

(cherry picked from commit 852612eac99dc403c0ea09a5daca9b65b5b7e123)

Co-authored-by: Ivan Timokhin <nixpkgs@ivan.timokhin.name>
Co-authored-by: Sandro <sandro.jaeckel@gmail.com>
This commit is contained in:
github-actions[bot] 2021-09-29 09:24:17 +03:00 committed by GitHub
parent 82891b5e2c
commit 94255ffab5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkgs/development/tools/selenium/chromedriver/default.nix
View File

@ -1,7 +1,8 @@
{ lib, stdenv, fetchurl, unzip, makeWrapper { lib, stdenv, fetchurl, unzip, makeWrapper
, cairo, fontconfig, freetype, gdk-pixbuf, glib , cairo, fontconfig, freetype, gdk-pixbuf, glib
, glibc, gtk2, libX11, nspr, nss, pango, gconf , glibc, gtk2, libX11, nspr, nss, pango, gconf
, libxcb, libXi, libXrender, libXext , libxcb, libXi, libXrender, libXext, dbus
, testVersion, chromedriver
}: }:
let let
@ -27,6 +28,7 @@ let
gdk-pixbuf glib gtk2 gconf gdk-pixbuf glib gtk2 gconf
libX11 nspr nss pango libXrender libX11 nspr nss pango libXrender
gconf libxcb libXext libXi gconf libxcb libXext libXi
dbus
]; ];
in stdenv.mkDerivation rec { in stdenv.mkDerivation rec {
@ -46,9 +48,11 @@ in stdenv.mkDerivation rec {
install -m755 -D chromedriver $out/bin/chromedriver install -m755 -D chromedriver $out/bin/chromedriver
'' + lib.optionalString (!stdenv.isDarwin) '' '' + lib.optionalString (!stdenv.isDarwin) ''
patchelf --set-interpreter ${glibc.out}/lib/ld-linux-x86-64.so.2 $out/bin/chromedriver patchelf --set-interpreter ${glibc.out}/lib/ld-linux-x86-64.so.2 $out/bin/chromedriver
wrapProgram "$out/bin/chromedriver" --prefix LD_LIBRARY_PATH : "${libs}:\$LD_LIBRARY_PATH" wrapProgram "$out/bin/chromedriver" --prefix LD_LIBRARY_PATH : "${libs}"
''; '';
passthru.tests.version = testVersion { package = chromedriver; };
meta = with lib; { meta = with lib; {
homepage = "https://chromedriver.chromium.org/"; homepage = "https://chromedriver.chromium.org/";
description = "A WebDriver server for running Selenium tests on Chrome"; description = "A WebDriver server for running Selenium tests on Chrome";