diff options
| author | Dmitry Kalinkin <dmitry.kalinkin@gmail.com> | 2019-12-05 12:04:58 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-12-05 12:04:58 -0500 |
| commit | 31cf89957abb3f7175b45245f26e2cad9e6720b9 (patch) | |
| tree | e8ee98b3574bd1126cf73f2d5ea90ed6aff406e1 | |
| parent | f8cd1b3a07cf3667d29e14a6796b720e27cd071e (diff) | |
| parent | 50915af13808bf62a62c80eeefd7bb9f2ed2e001 (diff) | |
| download | nixlib-31cf89957abb3f7175b45245f26e2cad9e6720b9.tar nixlib-31cf89957abb3f7175b45245f26e2cad9e6720b9.tar.gz nixlib-31cf89957abb3f7175b45245f26e2cad9e6720b9.tar.bz2 nixlib-31cf89957abb3f7175b45245f26e2cad9e6720b9.tar.lz nixlib-31cf89957abb3f7175b45245f26e2cad9e6720b9.tar.xz nixlib-31cf89957abb3f7175b45245f26e2cad9e6720b9.tar.zst nixlib-31cf89957abb3f7175b45245f26e2cad9e6720b9.zip | |
Merge pull request #74979 from Shopify/seb-phantomjs2-clang60
phantomjs2: Fix compilation when using clang60
| -rw-r--r-- | pkgs/development/tools/phantomjs2/default.nix | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/pkgs/development/tools/phantomjs2/default.nix b/pkgs/development/tools/phantomjs2/default.nix index 29b8d4d5ae1e..f50e7670b463 100644 --- a/pkgs/development/tools/phantomjs2/default.nix +++ b/pkgs/development/tools/phantomjs2/default.nix @@ -69,6 +69,10 @@ in stdenv.mkDerivation rec { --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"; enableParallelBuilding = true; |