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

glib: fix loading dylibs through gobject on darwin

This commit is contained in:
Tor Hedin Brønner 2019-10-03 06:17:35 +02:00 committed by worldofpeace
parent 31c4f79289
commit 259556da8a
1 changed files with 40 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -8,7 +8,7 @@
, doCheck ? config.doCheckByDefault or false , doCheck ? 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 , darwin, fetchpatch
}: }:
with stdenv.lib; with stdenv.lib;
@ -55,9 +55,15 @@ stdenv.mkDerivation rec {
sha256 = "046sqfmr84blxh4vkipmh8ff7wd19fxmh6lnr5ibchx3l02p49bc"; sha256 = "046sqfmr84blxh4vkipmh8ff7wd19fxmh6lnr5ibchx3l02p49bc";
}; };
patches = optional stdenv.isDarwin ./darwin-compilation.patch patches = optionals stdenv.isDarwin [
++ optional doCheck ./skip-timer-test.patch ./darwin-compilation.patch
++ optionals stdenv.hostPlatform.isMusl [ # fix loading dylibs on darwin
# Remove on 2.62.1
(fetchpatch {
url = "https://gitlab.gnome.org/GNOME/glib/commit/e2409e5e180f1fa369d0e87e38e4d646d9f68791.patch";
sha256 = "1dhjwlsqdgnn8fr8pzfrnd63m7pdgf7mizdyn8lwg17ggvq6qsqf";
})
] ++ optionals stdenv.hostPlatform.isMusl [
./quark_init_on_demand.patch ./quark_init_on_demand.patch
./gobject_init_on_demand.patch ./gobject_init_on_demand.patch
] ++ [ ] ++ [
@ -88,7 +94,7 @@ stdenv.mkDerivation rec {
# 3. Tools for desktop environment that cannot go to $bin due to $out depending on them ($out) # 3. Tools for desktop environment that cannot go to $bin due to $out depending on them ($out)
# * gio-launch-desktop # * gio-launch-desktop
./split-dev-programs.patch ./split-dev-programs.patch
]; ] ++ optional doCheck ./skip-timer-test.patch;
outputs = [ "bin" "out" "dev" "devdoc" ]; outputs = [ "bin" "out" "dev" "devdoc" ];