mirror of
https://github.com/ilyakooo0/nixpkgs.git
synced 2024-12-26 21:33:03 +03:00
qt5: fix to work on LLVM 4
Including apple_sdk.sdk is generally a recipe for a bad time on LLVM 3.8 and above, since you end up with bad headers in the wrong place that hurt the new libc++ in 3.8 and above. In this case, qt only wanted the super- generic SDK for CUPS headers, which we can just depend on directly now.
This commit is contained in:
parent
aa31d4b803
commit
6b1957d17a
@ -80,7 +80,7 @@ stdenv.mkDerivation {
|
|||||||
sed -i \
|
sed -i \
|
||||||
-e 's|! /usr/bin/xcode-select --print-path >/dev/null 2>&1;|false;|' \
|
-e 's|! /usr/bin/xcode-select --print-path >/dev/null 2>&1;|false;|' \
|
||||||
-e 's|! /usr/bin/xcrun -find xcodebuild >/dev/null 2>&1;|false;|' \
|
-e 's|! /usr/bin/xcrun -find xcodebuild >/dev/null 2>&1;|false;|' \
|
||||||
-e 's|sysroot=$(/usr/bin/xcodebuild -sdk $sdk -version Path 2>/dev/null)|sysroot="${darwin.apple_sdk.sdk}"|' \
|
-e 's|sysroot=$(/usr/bin/xcodebuild -sdk $sdk -version Path 2>/dev/null)|sysroot=/nonsense|' \
|
||||||
-e 's|QMAKE_CONF_COMPILER=`getXQMakeConf QMAKE_CXX`|QMAKE_CXX="clang++"\nQMAKE_CONF_COMPILER="clang++"|' \
|
-e 's|QMAKE_CONF_COMPILER=`getXQMakeConf QMAKE_CXX`|QMAKE_CXX="clang++"\nQMAKE_CONF_COMPILER="clang++"|' \
|
||||||
-e 's|XCRUN=`/usr/bin/xcrun -sdk macosx clang -v 2>&1`|XCRUN="clang -v 2>&1"|' \
|
-e 's|XCRUN=`/usr/bin/xcrun -sdk macosx clang -v 2>&1`|XCRUN="clang -v 2>&1"|' \
|
||||||
-e 's#sdk_val=$(/usr/bin/xcrun -sdk $sdk -find $(echo $val | cut -d \x27 \x27 -f 1))##' \
|
-e 's#sdk_val=$(/usr/bin/xcrun -sdk $sdk -find $(echo $val | cut -d \x27 \x27 -f 1))##' \
|
||||||
@ -208,7 +208,7 @@ stdenv.mkDerivation {
|
|||||||
xcbutil xcbutilimage xcbutilkeysyms xcbutilwm libxkbcommon
|
xcbutil xcbutilimage xcbutilkeysyms xcbutilwm libxkbcommon
|
||||||
] ++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [
|
] ++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [
|
||||||
ApplicationServices CoreServices AppKit Carbon OpenGL AGL Cocoa
|
ApplicationServices CoreServices AppKit Carbon OpenGL AGL Cocoa
|
||||||
DiskArbitration darwin.cf-private libiconv darwin.apple_sdk.sdk
|
DiskArbitration darwin.cf-private libiconv
|
||||||
]);
|
]);
|
||||||
|
|
||||||
buildInputs =
|
buildInputs =
|
||||||
|
@ -82,7 +82,7 @@ stdenv.mkDerivation {
|
|||||||
sed -i \
|
sed -i \
|
||||||
-e 's|! /usr/bin/xcode-select --print-path >/dev/null 2>&1;|false;|' \
|
-e 's|! /usr/bin/xcode-select --print-path >/dev/null 2>&1;|false;|' \
|
||||||
-e 's|! /usr/bin/xcrun -find xcodebuild >/dev/null 2>&1;|false;|' \
|
-e 's|! /usr/bin/xcrun -find xcodebuild >/dev/null 2>&1;|false;|' \
|
||||||
-e 's|sysroot=$(/usr/bin/xcodebuild -sdk $sdk -version Path 2>/dev/null)|sysroot="${darwin.apple_sdk.sdk}"|' \
|
-e 's|sysroot=$(/usr/bin/xcodebuild -sdk $sdk -version Path 2>/dev/null)|sysroot=/nonsense|' \
|
||||||
-e 's|QMAKE_CONF_COMPILER=`getXQMakeConf QMAKE_CXX`|QMAKE_CXX="clang++"\nQMAKE_CONF_COMPILER="clang++"|' \
|
-e 's|QMAKE_CONF_COMPILER=`getXQMakeConf QMAKE_CXX`|QMAKE_CXX="clang++"\nQMAKE_CONF_COMPILER="clang++"|' \
|
||||||
-e 's|XCRUN=`/usr/bin/xcrun -sdk macosx clang -v 2>&1`|XCRUN="clang -v 2>&1"|' \
|
-e 's|XCRUN=`/usr/bin/xcrun -sdk macosx clang -v 2>&1`|XCRUN="clang -v 2>&1"|' \
|
||||||
-e 's#sdk_val=$(/usr/bin/xcrun -sdk $sdk -find $(echo $val | cut -d \x27 \x27 -f 1))##' \
|
-e 's#sdk_val=$(/usr/bin/xcrun -sdk $sdk -find $(echo $val | cut -d \x27 \x27 -f 1))##' \
|
||||||
@ -212,7 +212,7 @@ stdenv.mkDerivation {
|
|||||||
xcbutilimage xcbutilkeysyms xcbutilrenderutil xcbutilwm
|
xcbutilimage xcbutilkeysyms xcbutilrenderutil xcbutilwm
|
||||||
] ++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [
|
] ++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [
|
||||||
ApplicationServices Foundation CoreServices AppKit Carbon OpenGL AGL Cocoa
|
ApplicationServices Foundation CoreServices AppKit Carbon OpenGL AGL Cocoa
|
||||||
DiskArbitration darwin.cf-private libiconv darwin.apple_sdk.sdk
|
DiskArbitration darwin.cf-private libiconv
|
||||||
]);
|
]);
|
||||||
|
|
||||||
buildInputs = [ ]
|
buildInputs = [ ]
|
||||||
|
@ -9446,7 +9446,7 @@ with pkgs;
|
|||||||
inherit newScope;
|
inherit newScope;
|
||||||
inherit stdenv fetchurl makeSetupHook makeWrapper;
|
inherit stdenv fetchurl makeSetupHook makeWrapper;
|
||||||
bison = bison2; # error: too few arguments to function 'int yylex(...
|
bison = bison2; # error: too few arguments to function 'int yylex(...
|
||||||
cups = if stdenv.isLinux then cups else null;
|
inherit cups;
|
||||||
harfbuzz = harfbuzz-icu;
|
harfbuzz = harfbuzz-icu;
|
||||||
mesa = mesa_noglu;
|
mesa = mesa_noglu;
|
||||||
inherit perl;
|
inherit perl;
|
||||||
@ -9459,7 +9459,7 @@ with pkgs;
|
|||||||
inherit newScope;
|
inherit newScope;
|
||||||
inherit stdenv fetchurl makeSetupHook makeWrapper;
|
inherit stdenv fetchurl makeSetupHook makeWrapper;
|
||||||
bison = bison2; # error: too few arguments to function 'int yylex(...
|
bison = bison2; # error: too few arguments to function 'int yylex(...
|
||||||
cups = if stdenv.isLinux then cups else null;
|
inherit cups;
|
||||||
harfbuzz = harfbuzz-icu;
|
harfbuzz = harfbuzz-icu;
|
||||||
mesa = mesa_noglu;
|
mesa = mesa_noglu;
|
||||||
inherit perl;
|
inherit perl;
|
||||||
|
Loading…
Reference in New Issue
Block a user