diff options
author | Alyssa Ross <hi@alyssa.is> | 2022-02-22 10:43:06 +0000 |
---|---|---|
committer | Alyssa Ross <hi@alyssa.is> | 2022-03-11 16:17:56 +0000 |
commit | ca1aada113c0ebda1ab8667199f6453f8e01c4fc (patch) | |
tree | 55e402280096f62eb0bc8bcad5ce6050c5a0aec7 /nixpkgs/pkgs/development/tools/selenium | |
parent | e4df5a52a6a6531f32626f57205356a773ac2975 (diff) | |
parent | 93883402a445ad467320925a0a5dbe43a949f25b (diff) | |
download | nixlib-ca1aada113c0ebda1ab8667199f6453f8e01c4fc.tar nixlib-ca1aada113c0ebda1ab8667199f6453f8e01c4fc.tar.gz nixlib-ca1aada113c0ebda1ab8667199f6453f8e01c4fc.tar.bz2 nixlib-ca1aada113c0ebda1ab8667199f6453f8e01c4fc.tar.lz nixlib-ca1aada113c0ebda1ab8667199f6453f8e01c4fc.tar.xz nixlib-ca1aada113c0ebda1ab8667199f6453f8e01c4fc.tar.zst nixlib-ca1aada113c0ebda1ab8667199f6453f8e01c4fc.zip |
Merge commit '93883402a445ad467320925a0a5dbe43a949f25b'
Conflicts: nixpkgs/nixos/modules/programs/ssh.nix nixpkgs/pkgs/applications/networking/browsers/firefox/packages.nix nixpkgs/pkgs/data/fonts/noto-fonts/default.nix nixpkgs/pkgs/development/go-modules/generic/default.nix nixpkgs/pkgs/development/interpreters/ruby/default.nix nixpkgs/pkgs/development/libraries/mesa/default.nix
Diffstat (limited to 'nixpkgs/pkgs/development/tools/selenium')
-rw-r--r-- | nixpkgs/pkgs/development/tools/selenium/chromedriver/default.nix | 6 | ||||
-rw-r--r-- | nixpkgs/pkgs/development/tools/selenium/selendroid/default.nix | 12 |
2 files changed, 8 insertions, 10 deletions
diff --git a/nixpkgs/pkgs/development/tools/selenium/chromedriver/default.nix b/nixpkgs/pkgs/development/tools/selenium/chromedriver/default.nix index c47cddea5867..a75488a229df 100644 --- a/nixpkgs/pkgs/development/tools/selenium/chromedriver/default.nix +++ b/nixpkgs/pkgs/development/tools/selenium/chromedriver/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchurl, unzip, makeWrapper , cairo, fontconfig, freetype, gdk-pixbuf, glib -, glibc, gtk2, libX11, nspr, nss, pango, gconf +, glibc, gtk2, libX11, nspr, nss, pango , libxcb, libXi, libXrender, libXext, dbus , testVersion, chromedriver }: @@ -30,9 +30,9 @@ let libs = lib.makeLibraryPath [ stdenv.cc.cc.lib cairo fontconfig freetype - gdk-pixbuf glib gtk2 gconf + gdk-pixbuf glib gtk2 libX11 nspr nss pango libXrender - gconf libxcb libXext libXi + libxcb libXext libXi dbus ]; diff --git a/nixpkgs/pkgs/development/tools/selenium/selendroid/default.nix b/nixpkgs/pkgs/development/tools/selenium/selendroid/default.nix index b029e7711a3e..975a040b8bc3 100644 --- a/nixpkgs/pkgs/development/tools/selenium/selendroid/default.nix +++ b/nixpkgs/pkgs/development/tools/selenium/selendroid/default.nix @@ -2,12 +2,12 @@ with lib; let - name = "selendroid-standalone-${version}"; + pname = "selendroid-standalone"; pluginName = "selendroid-grid-plugin-${version}"; version = "0.17.0"; srcs = { jar = fetchurl { - url = "https://github.com/selendroid/selendroid/releases/download/${version}/${name}-with-dependencies.jar"; + url = "https://github.com/selendroid/selendroid/releases/download/${version}/selendroid-standalone-${version}-with-dependencies.jar"; sha256 = "10lxdsgp711pv8r6dk2aagnbvnn1b25zfqjvz7plc73zqhx1dxvw"; }; gridPlugin = fetchurl { @@ -17,9 +17,7 @@ let }; in stdenv.mkDerivation { - - inherit name; - inherit version; + inherit pname version; dontUnpack = true; @@ -28,11 +26,11 @@ stdenv.mkDerivation { installPhase = '' mkdir -p $out/share/lib/selendroid - cp ${srcs.jar} $out/share/lib/selendroid/${name}.jar + cp ${srcs.jar} $out/share/lib/selendroid/selendroid-standalone-${version}.jar cp ${srcs.gridPlugin} $out/share/lib/selendroid/${pluginName}.jar makeWrapper ${jdk}/bin/java $out/bin/selendroid \ - --add-flags "-jar $out/share/lib/selendroid/${name}.jar" + --add-flags "-jar $out/share/lib/selendroid/selendroid-standalone-${version}.jar" makeWrapper ${jdk}/bin/java $out/bin/selendroid-selenium \ --add-flags "-Dfile.encoding=UTF-8" \ --add-flags "-cp ${selenium-server-standalone}/share/lib/${selenium-server-standalone.name}/${selenium-server-standalone.name}.jar:$out/share/lib/selendroid/${pluginName}.jar" \ |