git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #54007 from jtojnar/darwin-gsettings

Darwin GSettings support

commitef14a225bb2bdc32455c67442e2459c920554db3 authorJan Tojnar <jtojnar@gmail.com> dateSun 20 Jan 2019, 13:53 (8 years ago) parentb71ed9c2f4e167
4 files changed+39−3
pkgs/development/libraries/glib/default.nix+11−2 pkgs/development/tools/build-managers/meson/default.nix+7 pkgs/development/tools/build-managers/meson/fix-objc-linking.patch+20 pkgs/top-level/all-packages.nix+1−1
pkgs/development/libraries/glib/default.nix+11−2
@@ -8,6 +8,7 @@
88, doCheck ? stdenv.config.doCheckByDefault or false
99, coreutils, dbus, libxml2, tzdata
1010, desktop-file-utils, shared-mime-info
11+, darwin
1112}:
1213
1314with stdenv.lib;
@@ -44,6 +45,7 @@ let
4445 ln -sr -t "''${!outputInclude}/include/" "''${!outputInclude}"/lib/*/include/* 2>/dev/null || true
4546 '';
4647
48+ binPrograms = optional (!stdenv.isDarwin) "gapplication" ++ [ "gdbus" "gio" "gsettings" ];
4749 version = "2.58.2";
4850in
4951
@@ -83,7 +85,12 @@ stdenv.mkDerivation rec {
8385 ] ++ optionals stdenv.isLinux [
8486 libselinux
8587 utillinuxMinimal # for libmount
86− ];
88+ ] ++ optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [
89+ AppKit Carbon Cocoa CoreFoundation CoreServices Foundation
90+ # Needed for CFURLCreateFromFSRef, etc. which have deen deprecated
91+ # since 10.9 and are not part of swift-corelibs CoreFoundation.
92+ darwin.cf-private
93+ ]);
8794
8895 nativeBuildInputs = [
8996 meson ninja pkgconfig perl python3 gettext gtk-doc docbook_xsl docbook_xml_dtd_45 glibcLocales
@@ -121,15 +128,17 @@ stdenv.mkDerivation rec {
121128
122129 postInstall = ''
123130 mkdir -p $bin/bin
124− for app in gapplication gdbus gio gsettings; do
131+ for app in ${concatStringsSep " " binPrograms}; do
125132 mv "$dev/bin/$app" "$bin/bin"
126133 done
127134
135+ '' + optionalString (!stdenv.isDarwin) ''
128136 # Add gio-launch-desktop to $out so we can refer to it from $dev
129137 mkdir $out/bin
130138 mv "$dev/bin/gio-launch-desktop" "$out/bin/"
131139 ln -s "$out/bin/gio-launch-desktop" "$bin/bin/"
132140
141+ '' + ''
133142 moveToOutput "share/glib-2.0" "$dev"
134143 substituteInPlace "$dev/bin/gdbus-codegen" --replace "$out" "$dev"
135144 sed -i "$dev/bin/glib-gettextize" -e "s|^gettext_dir=.*|gettext_dir=$dev/share/glib-2.0/gettext|"
pkgs/development/tools/build-managers/meson/default.nix+7
@@ -44,6 +44,13 @@ python3Packages.buildPythonApplication rec {
4444 src = ./fix-rpath.patch;
4545 inherit (builtins) storeDir;
4646 })
47+ ] ++ lib.optionals stdenv.isDarwin [
48+ # We use custom Clang, which makes Meson think *not Apple*, while still
49+ # relying on system linker. When it detects standard Clang, Meson will
50+ # pass it `-Wl,-O1` flag but optimizations are not recognized by
51+ # Mac linker.
52+ # https://github.com/mesonbuild/meson/issues/4784
53+ ./fix-objc-linking.patch
4754 ];
4855
4956 setupHook = ./setup-hook.sh;
pkgs/development/tools/build-managers/meson/fix-objc-linking.patchnew file+20
@@ -0,0 +1,20 @@
1+--- a/mesonbuild/environment.py
2++++ b/mesonbuild/environment.py
3+@@ -795,7 +795,7 @@
4+ compiler_type = self.get_gnu_compiler_type(defines)
5+ version = self.get_gnu_version_from_defines(defines)
6+ return GnuObjCCompiler(ccache + compiler, version, compiler_type, is_cross, exe_wrap, defines)
7+- if out.startswith('Apple LLVM'):
8++ if out.startswith('Apple LLVM') or mesonlib.for_darwin(want_cross, self):
9+ return ClangObjCCompiler(ccache + compiler, version, CompilerType.CLANG_OSX, is_cross, exe_wrap)
10+ if out.startswith('clang'):
11+ return ClangObjCCompiler(ccache + compiler, version, CompilerType.CLANG_STANDARD, is_cross, exe_wrap)
12+@@ -822,7 +822,7 @@
13+ compiler_type = self.get_gnu_compiler_type(defines)
14+ version = self.get_gnu_version_from_defines(defines)
15+ return GnuObjCPPCompiler(ccache + compiler, version, compiler_type, is_cross, exe_wrap, defines)
16+- if out.startswith('Apple LLVM'):
17++ if out.startswith('Apple LLVM') or mesonlib.for_darwin(want_cross, self):
18+ return ClangObjCPPCompiler(ccache + compiler, version, CompilerType.CLANG_OSX, is_cross, exe_wrap)
19+ if out.startswith('clang'):
20+ return ClangObjCPPCompiler(ccache + compiler, version, CompilerType.CLANG_STANDARD, is_cross, exe_wrap)
pkgs/top-level/all-packages.nix+1−1
@@ -419,7 +419,7 @@ in
419419 findXMLCatalogs = makeSetupHook { } ../build-support/setup-hooks/find-xml-catalogs.sh;
420420
421421 wrapGAppsHook = makeSetupHook {
422− deps = [ gnome3.dconf.lib gnome3.gtk librsvg makeWrapper ];
422+ deps = lib.optional (!stdenv.isDarwin) gnome3.dconf.lib ++ [ gtk3 librsvg makeWrapper ];
423423 } ../build-support/setup-hooks/wrap-gapps-hook.sh;
424424
425425 separateDebugInfo = makeSetupHook { } ../build-support/setup-hooks/separate-debug-info.sh;