From b8538c680192924a77cac739ffac0438848649d4 Mon Sep 17 00:00:00 2001 From: Dan Peebles Date: Wed, 30 Aug 2017 11:49:34 -0400 Subject: [PATCH] chromedriver: fix on Darwin A refactor broke it by forcing a bunch of Linux-specific dependencies on Darwin that only get used in the patchelf invocation. --- .../tools/selenium/chromedriver/default.nix | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/pkgs/development/tools/selenium/chromedriver/default.nix b/pkgs/development/tools/selenium/chromedriver/default.nix index b349b389997..8912f52ba60 100644 --- a/pkgs/development/tools/selenium/chromedriver/default.nix +++ b/pkgs/development/tools/selenium/chromedriver/default.nix @@ -22,6 +22,14 @@ let spec = allSpecs."${stdenv.system}" or (throw "missing chromedriver binary for ${stdenv.system}"); + + libs = stdenv.lib.makeLibraryPath [ + stdenv.cc.cc.lib + cairo fontconfig freetype + gdk_pixbuf glib gtk2 gconf + libX11 nspr nss pango libXrender + gconf libXext libXi + ]; in stdenv.mkDerivation rec { name = "chromedriver-${version}"; @@ -36,14 +44,6 @@ stdenv.mkDerivation rec { unpackPhase = "unzip $src"; - libs = stdenv.lib.makeLibraryPath [ - stdenv.cc.cc.lib - cairo fontconfig freetype - gdk_pixbuf glib gtk2 gconf - libX11 nspr nss pango libXrender - gconf libXext libXi - ]; - installPhase = '' install -m755 -D chromedriver $out/bin/chromedriver '' + stdenv.lib.optionalString (!stdenv.isDarwin) ''