diff options
| author | Dan Peebles <pumpkin@me.com> | 2017-03-30 11:02:57 -0400 |
|---|---|---|
| committer | Dan Peebles <pumpkin@me.com> | 2017-03-30 11:03:05 -0400 |
| commit | 409fe12f7653bd1d9c20cf2759e32fc38f5c3ef4 (patch) | |
| tree | 6cec4641b8577594c44df7ab13181f315a256f7d /pkgs/development | |
| parent | 4d4488e793396a6ee938e758d501f3cceae16f1a (diff) | |
| download | nixpkgs-409fe12f7653bd1d9c20cf2759e32fc38f5c3ef4.tar nixpkgs-409fe12f7653bd1d9c20cf2759e32fc38f5c3ef4.tar.gz nixpkgs-409fe12f7653bd1d9c20cf2759e32fc38f5c3ef4.tar.bz2 nixpkgs-409fe12f7653bd1d9c20cf2759e32fc38f5c3ef4.tar.lz nixpkgs-409fe12f7653bd1d9c20cf2759e32fc38f5c3ef4.tar.xz nixpkgs-409fe12f7653bd1d9c20cf2759e32fc38f5c3ef4.tar.zst nixpkgs-409fe12f7653bd1d9c20cf2759e32fc38f5c3ef4.zip | |
qt4: fix to work on clang 4
The new clang is more strict about signed comparisons against pointers, so this adds a couple of ad-hoc patches to appease it.
Diffstat (limited to 'pkgs/development')
| -rw-r--r-- | pkgs/development/libraries/qt-4.x/4.8/default.nix | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/pkgs/development/libraries/qt-4.x/4.8/default.nix b/pkgs/development/libraries/qt-4.x/4.8/default.nix index b03b8896a5f..46bb7a4e8fa 100644 --- a/pkgs/development/libraries/qt-4.x/4.8/default.nix +++ b/pkgs/development/libraries/qt-4.x/4.8/default.nix @@ -54,6 +54,12 @@ stdenv.mkDerivation rec { # there might be more references, but this is the only one I could find substituteInPlace tools/macdeployqt/tests/tst_deployment_mac.cpp \ --replace /usr/lib/libstdc++.6.dylib "${stdenv.cc}/lib/libstdc++.6.dylib" + '' + stdenv.lib.optionalString stdenv.cc.isClang '' + substituteInPlace src/3rdparty/webkit/Source/WebCore/html/HTMLImageElement.cpp \ + --replace 'optionalHeight > 0' 'optionalHeight != NULL' + + substituteInPlace ./tools/linguist/linguist/messagemodel.cpp \ + --replace 'm->comment()) >= 0' 'm->comment()) != NULL' ''; patches = |