diff options
author | ivan-timokhin <nixpkgs@ivan.timokhin.name> | 2021-09-29 00:39:14 +0300 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-09-28 23:39:14 +0200 |
commit | 56cf4e1d0759ed2164128e4ba1b3acb32ce7c40d (patch) | |
tree | 7e2df0b87291dcb27979935f16b25ff0df8248f4 | |
parent | 0a3d9773b43e6ef71dea6266d890a07b5219765c (diff) | |
download | nixpkgs-56cf4e1d0759ed2164128e4ba1b3acb32ce7c40d.tar nixpkgs-56cf4e1d0759ed2164128e4ba1b3acb32ce7c40d.tar.gz nixpkgs-56cf4e1d0759ed2164128e4ba1b3acb32ce7c40d.tar.bz2 nixpkgs-56cf4e1d0759ed2164128e4ba1b3acb32ce7c40d.tar.lz nixpkgs-56cf4e1d0759ed2164128e4ba1b3acb32ce7c40d.tar.xz nixpkgs-56cf4e1d0759ed2164128e4ba1b3acb32ce7c40d.tar.zst nixpkgs-56cf4e1d0759ed2164128e4ba1b3acb32ce7c40d.zip |
chromedriver: add dbus to libraries, correct LD_LIBRARY_PATH wrapping (#139723)
* chromedriver: add dbus to libraries It is apparently required since version 94. Fixes issue #139547 * chromedriver: remove extraneous LD_LIBRARY_PATH in wrapProgram wrapProgram already prepends passed value to the specified environment variable; no need to specify it explicitly. * chromedriver: add a package test checking the reported version * Update pkgs/development/tools/selenium/chromedriver/default.nix Co-authored-by: Sandro <sandro.jaeckel@gmail.com>
-rw-r--r-- | pkgs/development/tools/selenium/chromedriver/default.nix | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/pkgs/development/tools/selenium/chromedriver/default.nix b/pkgs/development/tools/selenium/chromedriver/default.nix index d777d788aec..4df279f7313 100644 --- a/pkgs/development/tools/selenium/chromedriver/default.nix +++ b/pkgs/development/tools/selenium/chromedriver/default.nix @@ -1,7 +1,8 @@ { lib, stdenv, fetchurl, unzip, makeWrapper , cairo, fontconfig, freetype, gdk-pixbuf, glib , glibc, gtk2, libX11, nspr, nss, pango, gconf -, libxcb, libXi, libXrender, libXext +, libxcb, libXi, libXrender, libXext, dbus +, testVersion, chromedriver }: let @@ -27,6 +28,7 @@ let gdk-pixbuf glib gtk2 gconf libX11 nspr nss pango libXrender gconf libxcb libXext libXi + dbus ]; in stdenv.mkDerivation rec { @@ -46,9 +48,11 @@ in stdenv.mkDerivation rec { install -m755 -D chromedriver $out/bin/chromedriver '' + lib.optionalString (!stdenv.isDarwin) '' 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; { homepage = "https://chromedriver.chromium.org/"; description = "A WebDriver server for running Selenium tests on Chrome"; |