public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #67246 from tobim/gcc8/qt48

Browse Source 
qt48: Fix build for gcc8
This commit is contained in:
Robin Gloster
2019-08-28 12:21:07 +02:00
committed by GitHub
parent 55022869eb bd9d24a2dc
commit aafc6d09e7
1 changed files with 2 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/development/libraries/qt-4.x/4.8/default.nix
View File

@@ -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