Skip to content

glib: move glib-untested overrides into package.nix #485673

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
gepbird merged 1 commit into from
Feb 12, 2026
Merged

glib: move glib-untested overrides into package.nix #485673

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 12 additions & 4 deletions pkgs/by-name/gl/glib/package.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@
buildPackages,

# this is just for tests (not in the closure of any regular package)
glib,
dbus,
tzdata,
desktop-file-utils,
Expand All @@ -45,6 +46,13 @@
assert stdenv.hostPlatform.isLinux -> util-linuxMinimal != null;

let
glib-untested = glib.overrideAttrs { doCheck = false; };
# break dependency cycles
# these things are only used for tests, they don't get into the closure
dbus' = dbus.override { enableSystemd = false; };
shared-mime-info' = shared-mime-info.override { glib = glib-untested; };
desktop-file-utils' = desktop-file-utils.override { glib = glib-untested; };

gobject-introspection' = buildPackages.gobject-introspection.override {
propagateFullGlib = false;
# Avoid introducing cairo, which enables gobjectSupport by default.
Expand Down Expand Up @@ -213,8 +221,8 @@ stdenv.mkDerivation (finalAttrs: {

nativeCheckInputs = [
tzdata
desktop-file-utils
shared-mime-info
desktop-file-utils'
shared-mime-info'
];

mesonFlags = [
Expand Down Expand Up @@ -315,8 +323,8 @@ stdenv.mkDerivation (finalAttrs: {
export XDG_CACHE_HOME="$TMP"
export XDG_RUNTIME_HOME="$TMP"
export HOME="$TMP"
export XDG_DATA_DIRS="${desktop-file-utils}/share:${shared-mime-info}/share"
export G_TEST_DBUS_DAEMON="${dbus}/bin/dbus-daemon"
export XDG_DATA_DIRS="${desktop-file-utils'}/share:${shared-mime-info'}/share"
export G_TEST_DBUS_DAEMON="${dbus'}/bin/dbus-daemon"

# pkg_config_tests expects a PKG_CONFIG_PATH that points to meson-private, wrapped pkg-config
# tries to be clever and picks up the wrong glib at the end.
Expand Down
13 changes: 0 additions & 13 deletions pkgs/top-level/all-packages.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6824,19 +6824,6 @@ with pkgs;

grantlee = libsForQt5.callPackage ../development/libraries/grantlee { };

glib = callPackage ../by-name/gl/glib/package.nix (
let
glib-untested = glib.overrideAttrs { doCheck = false; };
in
{
# break dependency cycles
# these things are only used for tests, they don't get into the closure
shared-mime-info = shared-mime-info.override { glib = glib-untested; };
desktop-file-utils = desktop-file-utils.override { glib = glib-untested; };
dbus = dbus.override { enableSystemd = false; };
}
);

glirc = haskell.lib.compose.justStaticExecutables haskellPackages.glirc;

# Not moved to aliases while we decide if we should split the package again.
Expand Down
Loading