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

Merge pull request #54007 from jtojnar/darwin-gsettings

Browse Source 
Darwin GSettings support
This commit is contained in:
Jan Tojnar
2019-01-20 13:53:47 +01:00
committed by GitHub
parent b71ed9c888 2f4e167156
commit ef14a225bb
4 changed files with 39 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
pkgs/development/tools/build-managers/meson/default.nix
View File

@@ -44,6 +44,13 @@ python3Packages.buildPythonApplication rec {
src = ./fix-rpath.patch;
inherit (builtins) storeDir;
})
] ++ lib.optionals stdenv.isDarwin [
# We use custom Clang, which makes Meson think *not Apple*, while still
# relying on system linker. When it detects standard Clang, Meson will
# pass it `-Wl,-O1` flag but optimizations are not recognized by
# Mac linker.
# https://github.com/mesonbuild/meson/issues/4784
./fix-objc-linking.patch
];
setupHook = ./setup-hook.sh;

20
pkgs/development/tools/build-managers/meson/fix-objc-linking.patch Normal file
View File

@@ -0,0 +1,20 @@
--- a/mesonbuild/environment.py
+++ b/mesonbuild/environment.py
@@ -795,7 +795,7 @@
compiler_type = self.get_gnu_compiler_type(defines)
version = self.get_gnu_version_from_defines(defines)
return GnuObjCCompiler(ccache + compiler, version, compiler_type, is_cross, exe_wrap, defines)
- if out.startswith('Apple LLVM'):
+ if out.startswith('Apple LLVM') or mesonlib.for_darwin(want_cross, self):
return ClangObjCCompiler(ccache + compiler, version, CompilerType.CLANG_OSX, is_cross, exe_wrap)
if out.startswith('clang'):
return ClangObjCCompiler(ccache + compiler, version, CompilerType.CLANG_STANDARD, is_cross, exe_wrap)
@@ -822,7 +822,7 @@
compiler_type = self.get_gnu_compiler_type(defines)
version = self.get_gnu_version_from_defines(defines)
return GnuObjCPPCompiler(ccache + compiler, version, compiler_type, is_cross, exe_wrap, defines)
- if out.startswith('Apple LLVM'):
+ if out.startswith('Apple LLVM') or mesonlib.for_darwin(want_cross, self):
return ClangObjCPPCompiler(ccache + compiler, version, CompilerType.CLANG_OSX, is_cross, exe_wrap)
if out.startswith('clang'):
return ClangObjCPPCompiler(ccache + compiler, version, CompilerType.CLANG_STANDARD, is_cross, exe_wrap)