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

glib: depend on Darwin libraries

Browse Source 
To support GNextstepSettingsBackend and Cocoa notifications, certain libraries
need to be added on Darwin.
This commit is contained in:
Jan Tojnar 2019-01-15 23:02:46 +01:00
parent f09d193c1c
commit 2122baf8f6
No known key found for this signature in database
GPG Key ID: 7FAB2A15F7A607A4
1 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
pkgs/development/libraries/glib/default.nix
View File

@ -8,6 +8,7 @@
, doCheck ? stdenv.config.doCheckByDefault or false , doCheck ? stdenv.config.doCheckByDefault or false
, coreutils, dbus, libxml2, tzdata , coreutils, dbus, libxml2, tzdata
, desktop-file-utils, shared-mime-info , desktop-file-utils, shared-mime-info
, darwin
}: }:
with stdenv.lib; with stdenv.lib;
@ -44,6 +45,7 @@ let
ln -sr -t "''${!outputInclude}/include/" "''${!outputInclude}"/lib/*/include/* 2>/dev/null || true ln -sr -t "''${!outputInclude}/include/" "''${!outputInclude}"/lib/*/include/* 2>/dev/null || true
''; '';
binPrograms = optional (!stdenv.isDarwin) "gapplication" ++ [ "gdbus" "gio" "gsettings" ];
version = "2.58.2"; version = "2.58.2";
in in
@ -83,7 +85,12 @@ stdenv.mkDerivation rec {
] ++ optionals stdenv.isLinux [ ] ++ optionals stdenv.isLinux [
libselinux libselinux
utillinuxMinimal # for libmount 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 = [ nativeBuildInputs = [
meson ninja pkgconfig perl python3 gettext gtk-doc docbook_xsl docbook_xml_dtd_45 glibcLocales meson ninja pkgconfig perl python3 gettext gtk-doc docbook_xsl docbook_xml_dtd_45 glibcLocales
@ -121,15 +128,17 @@ stdenv.mkDerivation rec {
postInstall = '' postInstall = ''
mkdir -p $bin/bin mkdir -p $bin/bin
for app in gapplication gdbus gio gsettings; do for app in ${concatStringsSep " " binPrograms}; do
mv "$dev/bin/$app" "$bin/bin" mv "$dev/bin/$app" "$bin/bin"
done done
'' + optionalString (!stdenv.isDarwin) ''
# Add gio-launch-desktop to $out so we can refer to it from $dev # Add gio-launch-desktop to $out so we can refer to it from $dev
mkdir $out/bin mkdir $out/bin
mv "$dev/bin/gio-launch-desktop" "$out/bin/" mv "$dev/bin/gio-launch-desktop" "$out/bin/"
ln -s "$out/bin/gio-launch-desktop" "$bin/bin/" ln -s "$out/bin/gio-launch-desktop" "$bin/bin/"
'' + ''
moveToOutput "share/glib-2.0" "$dev" moveToOutput "share/glib-2.0" "$dev"
substituteInPlace "$dev/bin/gdbus-codegen" --replace "$out" "$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|" sed -i "$dev/bin/glib-gettextize" -e "s|^gettext_dir=.*|gettext_dir=$dev/share/glib-2.0/gettext|"