From bd9d24a2dc8b8e9d0760c68819fe85f8b9f98134 Mon Sep 17 00:00:00 2001 From: Tobias Mayer Date: Thu, 22 Aug 2019 13:24:56 +0200 Subject: qt48: Fix build for gcc8 --- pkgs/development/libraries/qt-4.x/4.8/default.nix | 2 ++ 1 file changed, 2 insertions(+) (limited to 'pkgs/development') 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 d5bd065ab648..1d0429e9e752 100644 --- a/pkgs/development/libraries/qt-4.x/4.8/default.nix +++ b/pkgs/development/libraries/qt-4.x/4.8/default.nix @@ -47,6 +47,8 @@ stdenv.mkDerivation rec { prePatch = '' substituteInPlace configure --replace /bin/pwd pwd substituteInPlace src/corelib/global/global.pri --replace /bin/ls ${coreutils}/bin/ls + substituteInPlace src/3rdparty/javascriptcore/JavaScriptCore/jit/JITStubs.cpp \ + --replace 'asm volatile' 'asm' sed -e 's@/\(usr\|opt\)/@/var/empty/@g' -i config.tests/*/*.test -i mkspecs/*/*.conf '' + lib.optionalString stdenv.isDarwin '' # remove impure reference to /usr/lib/libstdc++.6.dylib -- cgit 1.4.1