diff options
| author | Robin Gloster <mail@glob.in> | 2019-08-28 12:21:07 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-08-28 12:21:07 +0200 |
| commit | aafc6d09e7f3400a9df145010cc4af7106a8ae81 (patch) | |
| tree | dbd84c7c8c88f76e83dbaf1d8a9748823b046da6 /pkgs/development/libraries | |
| parent | 55022869eb554725be89c59a9bad34b414dbea62 (diff) | |
| parent | bd9d24a2dc8b8e9d0760c68819fe85f8b9f98134 (diff) | |
| download | nixpkgs-aafc6d09e7f3400a9df145010cc4af7106a8ae81.tar nixpkgs-aafc6d09e7f3400a9df145010cc4af7106a8ae81.tar.gz nixpkgs-aafc6d09e7f3400a9df145010cc4af7106a8ae81.tar.bz2 nixpkgs-aafc6d09e7f3400a9df145010cc4af7106a8ae81.tar.lz nixpkgs-aafc6d09e7f3400a9df145010cc4af7106a8ae81.tar.xz nixpkgs-aafc6d09e7f3400a9df145010cc4af7106a8ae81.tar.zst nixpkgs-aafc6d09e7f3400a9df145010cc4af7106a8ae81.zip | |
Merge pull request #67246 from tobim/gcc8/qt48
qt48: Fix build for gcc8
Diffstat (limited to 'pkgs/development/libraries')
| -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 8c1c76db8f4..b5a10e8f11a 100644 --- a/pkgs/development/libraries/qt-4.x/4.8/default.nix +++ b/pkgs/development/libraries/qt-4.x/4.8/default.nix @@ -48,6 +48,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 |