summary refs log tree commit diff
diff options
context:
space:
mode:
authorHarmen <alicebob@lijzij.de>2017-10-02 23:08:48 +0200
committerHarmen <alicebob@lijzij.de>2017-10-02 23:40:59 +0200
commitfff93f5a59696201389f3003f0431934232c176d (patch)
tree6b947da71c242e61b290737673d91a0790ea39c8
parent6dc9d21cc8675becf323159d5f3880075550c098 (diff)
downloadnixpkgs-fff93f5a59696201389f3003f0431934232c176d.tar
nixpkgs-fff93f5a59696201389f3003f0431934232c176d.tar.gz
nixpkgs-fff93f5a59696201389f3003f0431934232c176d.tar.bz2
nixpkgs-fff93f5a59696201389f3003f0431934232c176d.tar.lz
nixpkgs-fff93f5a59696201389f3003f0431934232c176d.tar.xz
nixpkgs-fff93f5a59696201389f3003f0431934232c176d.tar.zst
nixpkgs-fff93f5a59696201389f3003f0431934232c176d.zip
phantomjs2: add qtbase's bin to PATH
-rw-r--r--pkgs/development/tools/phantomjs2/default.nix6
1 files changed, 5 insertions, 1 deletions
diff --git a/pkgs/development/tools/phantomjs2/default.nix b/pkgs/development/tools/phantomjs2/default.nix
index 8c03c32655a..ee5de04a782 100644
--- a/pkgs/development/tools/phantomjs2/default.nix
+++ b/pkgs/development/tools/phantomjs2/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, fetchpatch
 , bison2, flex, fontconfig, freetype, gperf, icu, openssl, libjpeg
 , libpng, perl, python, ruby, sqlite, qtwebkit, qmake, qtbase
-, darwin, writeScriptBin, cups
+, darwin, writeScriptBin, cups, makeWrapper
 }:
 
 let
@@ -47,6 +47,7 @@ in stdenv.mkDerivation rec {
   buildInputs = [
     bison2 flex fontconfig freetype gperf icu openssl
     libjpeg libpng perl python ruby sqlite qtwebkit qtbase
+    makeWrapper
   ] ++ stdenv.lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [
     AGL ApplicationServices AppKit Cocoa OpenGL
     darwin.libobjc fakeClang cups
@@ -98,6 +99,9 @@ in stdenv.mkDerivation rec {
         ${darwin.configd}/Library/Frameworks/SystemConfiguration.framework/SystemConfiguration \
         /System/Library/Frameworks/SystemConfiguration.framework/Versions/A/SystemConfiguration \
     $out/bin/phantomjs
+  '' + ''
+    wrapProgram $out/bin/phantomjs \
+    --prefix PATH : ${stdenv.lib.makeBinPath [ qtbase ]}
   '';
 
   preFixup = ''