BoomMicrophone/nixpkgs-suyu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #74979 from Shopify/seb-phantomjs2-clang60

Browse source 
phantomjs2: Fix compilation when using clang60
This commit is contained in:
Dmitry Kalinkin 2019-12-05 12:04:58 -05:00 committed by GitHub
commit 31cf89957a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
pkgs/development/tools/phantomjs2/default.nix
View file

@ -69,6 +69,10 @@ in stdenv.mkDerivation rec {
--replace "QT_MINOR_VERSION, 5" "QT_MINOR_VERSION, 9" --replace "QT_MINOR_VERSION, 5" "QT_MINOR_VERSION, 9"
''; '';
# Avoids error in webpage.cpp:80:89:
# invalid suffix on literal; C++11 requires a space between litend identifier
NIX_CFLAGS_COMPILE = "-Wno-reserved-user-defined-literal";
__impureHostDeps = stdenv.lib.optional stdenv.isDarwin "/usr/lib/libicucore.dylib"; __impureHostDeps = stdenv.lib.optional stdenv.isDarwin "/usr/lib/libicucore.dylib";
enableParallelBuilding = true; enableParallelBuilding = true;