From 97b95d60d895bd4064f8feec75792ac990ab3be8 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Thu, 20 Jun 2013 09:21:25 -0400 Subject: [PATCH] Chromedriver: update to 2.0 Signed-off-by: Shea Levy --- .../tools/selenium/chromedriver/default.nix | 16 +++++++--------- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 8 insertions(+), 10 deletions(-) diff --git a/pkgs/development/tools/selenium/chromedriver/default.nix b/pkgs/development/tools/selenium/chromedriver/default.nix index 063af69a7f37..bccaa70ead7c 100644 --- a/pkgs/development/tools/selenium/chromedriver/default.nix +++ b/pkgs/development/tools/selenium/chromedriver/default.nix @@ -1,22 +1,20 @@ { stdenv, fetchurl, cairo, fontconfig, freetype, gdk_pixbuf, glib -, glibc, gtk, libX11, makeWrapper, nspr, nss, pango, unzip +, glibc, gtk, libX11, makeWrapper, nspr, nss, pango, unzip, gconf +, libXrender, libXext }: # note: there is a i686 version available as well assert stdenv.system == "x86_64-linux"; stdenv.mkDerivation rec { - name = "chromedriver_linux64_26.0.1383.0"; + name = "chromedriver_linux64_2.0"; src = fetchurl { url = "http://chromedriver.googlecode.com/files/${name}.zip"; - sha256 = "0fh4r2rcpjc3nfrdyj256kjlyc0b6mhxqwxcah73q4vm1kjax8rs"; + sha256 = "165dq5550fs6262qa2jnjvm9smwjvws2zkkz7z5v4ibfg2j3409m"; }; - buildInputs = [ - cairo fontconfig freetype gdk_pixbuf glib gtk libX11 makeWrapper - nspr nss pango unzip - ]; + buildInputs = [ unzip makeWrapper ]; unpackPhase = "unzip $src"; @@ -25,7 +23,7 @@ stdenv.mkDerivation rec { mv chromedriver $out/bin patchelf --set-interpreter ${glibc}/lib/ld-linux-x86-64.so.2 $out/bin/chromedriver wrapProgram "$out/bin/chromedriver" \ - --prefix LD_LIBRARY_PATH : "$(cat ${stdenv.gcc}/nix-support/orig-gcc)/lib64:${cairo}/lib:${fontconfig}/lib:${freetype}/lib:${gdk_pixbuf}/lib:${glib}/lib:${gtk}/lib:${libX11}/lib:${nspr}/lib:${nss}/lib:${pango}/lib:\$LD_LIBRARY_PATH" + --prefix LD_LIBRARY_PATH : "$(cat ${stdenv.gcc}/nix-support/orig-gcc)/lib64:${cairo}/lib:${fontconfig}/lib:${freetype}/lib:${gdk_pixbuf}/lib:${glib}/lib:${gtk}/lib:${libX11}/lib:${nspr}/lib:${nss}/lib:${pango}/lib:${libXrender}/lib:${gconf}/lib:${libXext}/lib:\$LD_LIBRARY_PATH" ''; meta = with stdenv.lib; { @@ -34,4 +32,4 @@ stdenv.mkDerivation rec { license = licenses.bsd3; maintainers = [ maintainers.goibhniu ]; }; -} \ No newline at end of file +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 695755f08db5..412d48e863ce 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3252,7 +3252,7 @@ let cgdb = callPackage ../development/tools/misc/cgdb { }; - chromedriver = callPackage ../development/tools/selenium/chromedriver { }; + chromedriver = callPackage ../development/tools/selenium/chromedriver { gconf = gnome.GConf; }; complexity = callPackage ../development/tools/misc/complexity { };