diff options
| author | Orivej Desh <orivej@gmx.fr> | 2017-10-02 21:56:35 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-10-02 21:56:35 +0000 |
| commit | dd02fae2c49c675d7c6d7c69220452478d705b8d (patch) | |
| tree | 1500530a639ebbaf73eba41f3a1e1276e57913a7 /pkgs | |
| parent | 672bf13c1fd88d39d350a8556bb47947fddf3e25 (diff) | |
| parent | fff93f5a59696201389f3003f0431934232c176d (diff) | |
| download | nixlib-dd02fae2c49c675d7c6d7c69220452478d705b8d.tar nixlib-dd02fae2c49c675d7c6d7c69220452478d705b8d.tar.gz nixlib-dd02fae2c49c675d7c6d7c69220452478d705b8d.tar.bz2 nixlib-dd02fae2c49c675d7c6d7c69220452478d705b8d.tar.lz nixlib-dd02fae2c49c675d7c6d7c69220452478d705b8d.tar.xz nixlib-dd02fae2c49c675d7c6d7c69220452478d705b8d.tar.zst nixlib-dd02fae2c49c675d7c6d7c69220452478d705b8d.zip | |
Merge pull request #30036 from alicebob/phantomjs2
phantomjs2: add qtbase's bin to PATH
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/development/tools/phantomjs2/default.nix | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/pkgs/development/tools/phantomjs2/default.nix b/pkgs/development/tools/phantomjs2/default.nix index 8c03c32655a9..ee5de04a782d 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 = '' |