Skip to content

Commit 8565423

Browse files
committed
unbreak linux build and cleanup library_dependency aliases to always list [unix-name, windows-name]
1 parent 1c33500 commit 8565423

File tree

1 file changed

+17
-17
lines changed

1 file changed

+17
-17
lines changed

deps/build.jl

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -5,17 +5,17 @@ using BinDeps
55
group = library_group("gtk")
66

77
deps = [
8-
gtk = library_dependency("gtk", aliases = ["libgtk-3", "libgtk-3-0"], group = group)
98
glib = library_dependency("glib", aliases = ["libglib-2.0", "libglib-2.0-0"], group = group)
10-
gdk = library_dependency("gdk", aliases = ["libgdk-3-0", "libgdk-3.0"], group = group)
11-
gdk_pixbuf = library_dependency("gdk_pixbuf", aliases = ["libgdk_pixbuf-2.0-0", "libgdk_pixbuf-2.0.0"], group = group)
12-
gio = library_dependency("gio", aliases = ["libgio-2.0-0","libgio-2.0.0"], group = group)
13-
gobject = library_dependency("gobject", aliases = ["libgobject-2.0.0", "libgobject-2.0-0", "libgobject-2.0", "libgobject-2_0-0"], group = group)
9+
gobject = library_dependency("gobject", aliases = ["libgobject-2.0", "libgobject-2.0-0"], group = group)
10+
gtk = library_dependency("gtk", aliases = ["libgtk-3", "libgtk-3-0"], group = group)
11+
gdk = library_dependency("gdk", aliases = ["libgdk-3", "libgdk-3-0"], group = group)
12+
gdk_pixbuf = library_dependency("gdk_pixbuf", aliases = ["libgdk_pixbuf-2.0", "libgdk_pixbuf-2.0-0"], group = group)
13+
gio = library_dependency("gio", aliases = ["libgio-2.0", "libgio-2.0-0"], group = group)
1414
]
1515

1616
@linux_only begin
17-
provides(AptGet, "libgtk-3-0", gtk)
18-
provides(Yum, "gtk3", gtk)
17+
provides(AptGet, "libgtk-3-0", deps)
18+
provides(Yum, "gtk3", deps)
1919
end
2020

2121
@windows_only begin
@@ -27,24 +27,24 @@ end
2727
@osx_only begin
2828
using Homebrew
2929
provides(Homebrew.HB, "gtk+3", [gtk, gdk, gobject], os = :Darwin, onload =
30-
"""
31-
function __init__bindeps__()
32-
if "XDG_DATA_DIRS" in ENV
33-
ENV["XDG_DATA_DIRS"] *= ":" * joinpath("$(Homebrew.brew_prefix)", "share")
34-
else
35-
ENV["XDG_DATA_DIRS"] = joinpath("$(Homebrew.brew_prefix)", "share")
30+
"""
31+
function __init__bindeps__()
32+
if "XDG_DATA_DIRS" in ENV
33+
ENV["XDG_DATA_DIRS"] *= ":" * joinpath("$(Homebrew.brew_prefix)", "share")
34+
else
35+
ENV["XDG_DATA_DIRS"] = joinpath("$(Homebrew.brew_prefix)", "share")
36+
end
3637
end
37-
end
38-
""")
38+
""")
3939
provides(Homebrew.HB, "glib", [glib, gio], os = :Darwin)
4040
provides(Homebrew.HB, "gdk-pixbuf", gdk_pixbuf, os = :Darwin)
4141
end
4242

4343
@BinDeps.install [
44+
:glib => :libglib,
45+
:gobject => :libgobject,
4446
:gtk => :libgtk,
4547
:gdk => :libgdk,
4648
:gdk_pixbuf => :libgdk_pixbuf,
4749
:gio => :libgio,
48-
:gobject => :libgobject,
49-
:glib => :libglib
5050
]

0 commit comments

Comments
 (0)