diff options
| author | Jan Tojnar <jtojnar@gmail.com> | 2019-01-20 13:53:47 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-01-20 13:53:47 +0100 |
| commit | ef14a225bb2bdc32455c67442e2459c920554db3 (patch) | |
| tree | f3e5d1648483ec5c838de94491851e64c0dcbe56 /pkgs/development/libraries | |
| parent | b71ed9c88899ecd5e6752ec43545a09fd166e911 (diff) | |
| parent | 2f4e167156b8e9f5852010f63e0a4067c7237d39 (diff) | |
| download | nixlib-ef14a225bb2bdc32455c67442e2459c920554db3.tar nixlib-ef14a225bb2bdc32455c67442e2459c920554db3.tar.gz nixlib-ef14a225bb2bdc32455c67442e2459c920554db3.tar.bz2 nixlib-ef14a225bb2bdc32455c67442e2459c920554db3.tar.lz nixlib-ef14a225bb2bdc32455c67442e2459c920554db3.tar.xz nixlib-ef14a225bb2bdc32455c67442e2459c920554db3.tar.zst nixlib-ef14a225bb2bdc32455c67442e2459c920554db3.zip | |
Merge pull request #54007 from jtojnar/darwin-gsettings
Darwin GSettings support
Diffstat (limited to 'pkgs/development/libraries')
| -rw-r--r-- | pkgs/development/libraries/glib/default.nix | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/pkgs/development/libraries/glib/default.nix b/pkgs/development/libraries/glib/default.nix index 37275489cc3d..024ccf2a4537 100644 --- a/pkgs/development/libraries/glib/default.nix +++ b/pkgs/development/libraries/glib/default.nix @@ -8,6 +8,7 @@ , doCheck ? stdenv.config.doCheckByDefault or false , coreutils, dbus, libxml2, tzdata , desktop-file-utils, shared-mime-info +, darwin }: with stdenv.lib; @@ -44,6 +45,7 @@ let ln -sr -t "''${!outputInclude}/include/" "''${!outputInclude}"/lib/*/include/* 2>/dev/null || true ''; + binPrograms = optional (!stdenv.isDarwin) "gapplication" ++ [ "gdbus" "gio" "gsettings" ]; version = "2.58.2"; in @@ -83,7 +85,12 @@ stdenv.mkDerivation rec { ] ++ optionals stdenv.isLinux [ libselinux utillinuxMinimal # for libmount - ]; + ] ++ optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ + AppKit Carbon Cocoa CoreFoundation CoreServices Foundation + # Needed for CFURLCreateFromFSRef, etc. which have deen deprecated + # since 10.9 and are not part of swift-corelibs CoreFoundation. + darwin.cf-private + ]); nativeBuildInputs = [ meson ninja pkgconfig perl python3 gettext gtk-doc docbook_xsl docbook_xml_dtd_45 glibcLocales @@ -121,15 +128,17 @@ stdenv.mkDerivation rec { postInstall = '' mkdir -p $bin/bin - for app in gapplication gdbus gio gsettings; do + for app in ${concatStringsSep " " binPrograms}; do mv "$dev/bin/$app" "$bin/bin" done + '' + optionalString (!stdenv.isDarwin) '' # Add gio-launch-desktop to $out so we can refer to it from $dev mkdir $out/bin mv "$dev/bin/gio-launch-desktop" "$out/bin/" ln -s "$out/bin/gio-launch-desktop" "$bin/bin/" + '' + '' moveToOutput "share/glib-2.0" "$dev" substituteInPlace "$dev/bin/gdbus-codegen" --replace "$out" "$dev" sed -i "$dev/bin/glib-gettextize" -e "s|^gettext_dir=.*|gettext_dir=$dev/share/glib-2.0/gettext|" |