public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #30036 from alicebob/phantomjs2

Browse Source 
phantomjs2: add qtbase's bin to PATH
This commit is contained in:
Orivej Desh 2017-10-02 21:56:35 +00:00 committed by GitHub
commit dd02fae2c4
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/development/tools/phantomjs2/default.nix
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 = ''