diff options
author | Vladimír Čunát <vcunat@gmail.com> | 2016-04-13 09:25:28 +0200 |
---|---|---|
committer | Vladimír Čunát <vcunat@gmail.com> | 2016-04-13 09:25:28 +0200 |
commit | 39ebb01d6e8d19b042fe65d303234d0db27877eb (patch) | |
tree | 083025f5791bfce9f14e1d3f4c66035ef82ba72d /pkgs/development/tools/selenium | |
parent | 81cedab4f1fe9578e004ce03de5630a25c737a9e (diff) | |
parent | 87b49397bf1e26ac17c4a55fed41bd836fefc39d (diff) | |
download | nixpkgs-39ebb01d6e8d19b042fe65d303234d0db27877eb.tar nixpkgs-39ebb01d6e8d19b042fe65d303234d0db27877eb.tar.gz nixpkgs-39ebb01d6e8d19b042fe65d303234d0db27877eb.tar.bz2 nixpkgs-39ebb01d6e8d19b042fe65d303234d0db27877eb.tar.lz nixpkgs-39ebb01d6e8d19b042fe65d303234d0db27877eb.tar.xz nixpkgs-39ebb01d6e8d19b042fe65d303234d0db27877eb.tar.zst nixpkgs-39ebb01d6e8d19b042fe65d303234d0db27877eb.zip |
Merge branch 'staging', containing closure-size #7701
Diffstat (limited to 'pkgs/development/tools/selenium')
-rw-r--r-- | pkgs/development/tools/selenium/chromedriver/default.nix | 4 | ||||
-rw-r--r-- | pkgs/development/tools/selenium/server/default.nix | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/development/tools/selenium/chromedriver/default.nix b/pkgs/development/tools/selenium/chromedriver/default.nix index a2dd9d9784b..dd6d75771a3 100644 --- a/pkgs/development/tools/selenium/chromedriver/default.nix +++ b/pkgs/development/tools/selenium/chromedriver/default.nix @@ -23,9 +23,9 @@ stdenv.mkDerivation rec { installPhase = '' mkdir -p $out/bin mv chromedriver $out/bin - patchelf --set-interpreter ${glibc}/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 : "$(cat ${stdenv.cc}/nix-support/orig-cc)/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:${libXi}/lib:\$LD_LIBRARY_PATH" + --prefix LD_LIBRARY_PATH : "$(cat ${stdenv.cc}/nix-support/orig-cc)/lib64:${stdenv.lib.makeLibraryPath [ cairo fontconfig freetype gdk_pixbuf glib gtk libX11 nspr nss pango libXrender gconf libXext libXi ]}:\$LD_LIBRARY_PATH" ''; meta = with stdenv.lib; { diff --git a/pkgs/development/tools/selenium/server/default.nix b/pkgs/development/tools/selenium/server/default.nix index 2efd85f8401..66d9668fe82 100644 --- a/pkgs/development/tools/selenium/server/default.nix +++ b/pkgs/development/tools/selenium/server/default.nix @@ -29,7 +29,7 @@ in stdenv.mkDerivation rec { ${jdk}/bin/jar xf $src launchers/launcher-linux-amd64 patchelf \ --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ - --set-rpath "${gcc.cc}/lib/:${gcc.cc}/lib64:${xorg.libX11}/lib" \ + --set-rpath "${gcc.cc}/lib/:${gcc.cc}/lib64:${xorg.libX11.out}/lib" \ launchers/launcher-linux-${arch} ${jdk}/bin/jar uf $src launchers/launcher-linux-${arch} ''; |