diff options
| author | Tobias Mayer <tobim@fastmail.fm> | 2019-08-22 13:24:56 +0200 |
|---|---|---|
| committer | Tobias Mayer <tobim@fastmail.fm> | 2019-08-22 13:24:56 +0200 |
| commit | bd9d24a2dc8b8e9d0760c68819fe85f8b9f98134 (patch) | |
| tree | ec887f32e3dc2db2a2c1f1bfadcdafd6f6fe375e | |
| parent | 45d6ccea3357c65135b985f2eebf88020ca6461e (diff) | |
| download | nixlib-bd9d24a2dc8b8e9d0760c68819fe85f8b9f98134.tar nixlib-bd9d24a2dc8b8e9d0760c68819fe85f8b9f98134.tar.gz nixlib-bd9d24a2dc8b8e9d0760c68819fe85f8b9f98134.tar.bz2 nixlib-bd9d24a2dc8b8e9d0760c68819fe85f8b9f98134.tar.lz nixlib-bd9d24a2dc8b8e9d0760c68819fe85f8b9f98134.tar.xz nixlib-bd9d24a2dc8b8e9d0760c68819fe85f8b9f98134.tar.zst nixlib-bd9d24a2dc8b8e9d0760c68819fe85f8b9f98134.zip | |
qt48: Fix build for gcc8
| -rw-r--r-- | pkgs/development/libraries/qt-4.x/4.8/default.nix | 2 |
1 files changed, 2 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 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 |