Merge pull request #30036 from alicebob/phantomjs2
phantomjs2: add qtbase's bin to PATH
This commit is contained in:
commit
dd02fae2c4
@ -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 = ''
|
||||
|
Loading…
Reference in New Issue
Block a user