phantomjs2: add qtbase's bin to PATH

This commit is contained in:
Harmen 2017-10-02 23:08:48 +02:00
parent 6dc9d21cc8
commit fff93f5a59

View File

@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, fetchpatch { stdenv, fetchFromGitHub, fetchpatch
, bison2, flex, fontconfig, freetype, gperf, icu, openssl, libjpeg , bison2, flex, fontconfig, freetype, gperf, icu, openssl, libjpeg
, libpng, perl, python, ruby, sqlite, qtwebkit, qmake, qtbase , libpng, perl, python, ruby, sqlite, qtwebkit, qmake, qtbase
, darwin, writeScriptBin, cups , darwin, writeScriptBin, cups, makeWrapper
}: }:
let let
@ -47,6 +47,7 @@ in stdenv.mkDerivation rec {
buildInputs = [ buildInputs = [
bison2 flex fontconfig freetype gperf icu openssl bison2 flex fontconfig freetype gperf icu openssl
libjpeg libpng perl python ruby sqlite qtwebkit qtbase libjpeg libpng perl python ruby sqlite qtwebkit qtbase
makeWrapper
] ++ stdenv.lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ ] ++ stdenv.lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [
AGL ApplicationServices AppKit Cocoa OpenGL AGL ApplicationServices AppKit Cocoa OpenGL
darwin.libobjc fakeClang cups darwin.libobjc fakeClang cups
@ -98,6 +99,9 @@ in stdenv.mkDerivation rec {
${darwin.configd}/Library/Frameworks/SystemConfiguration.framework/SystemConfiguration \ ${darwin.configd}/Library/Frameworks/SystemConfiguration.framework/SystemConfiguration \
/System/Library/Frameworks/SystemConfiguration.framework/Versions/A/SystemConfiguration \ /System/Library/Frameworks/SystemConfiguration.framework/Versions/A/SystemConfiguration \
$out/bin/phantomjs $out/bin/phantomjs
'' + ''
wrapProgram $out/bin/phantomjs \
--prefix PATH : ${stdenv.lib.makeBinPath [ qtbase ]}
''; '';
preFixup = '' preFixup = ''