Skip to content
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

glib: move to by-name #367270

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
+420 −347
Open

glib: move to by-name #367270

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
417ac88
glib: Format the expression
jtojnar Dec 22, 2024
f9f55e4
glib: move to by-name
jtojnar Dec 22, 2024
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
0 ...t/libraries/glib/darwin-compilation.patch → .../by-name/gl/glib/darwin-compilation.patch
View file
Open in desktop
File renamed without changes.
0 ...es/glib/elementary-terminal-support.patch → ...gl/glib/elementary-terminal-support.patch
View file
Open in desktop
File renamed without changes.
0 ...velopment/libraries/glib/gdb_script.patch → pkgs/by-name/gl/glib/gdb_script.patch
View file
Open in desktop
File renamed without changes.
0 ...t/libraries/glib/glib-appinfo-watch.patch → .../by-name/gl/glib/glib-appinfo-watch.patch
View file
Open in desktop
File renamed without changes.
0 ...braries/glib/gobject_init_on_demand.patch → ...name/gl/glib/gobject_init_on_demand.patch
View file
Open in desktop
File renamed without changes.
419 changes: 419 additions & 0 deletions pkgs/by-name/gl/glib/package.nix
View file
Open in desktop

Large diffs are not rendered by default.

0 ...libraries/glib/quark_init_on_demand.patch → ...y-name/gl/glib/quark_init_on_demand.patch
View file
Open in desktop
File renamed without changes.
0 ...aries/glib/schema-override-variable.patch → ...me/gl/glib/schema-override-variable.patch
View file
Open in desktop
File renamed without changes.
0 .../development/libraries/glib/setup-hook.sh → pkgs/by-name/gl/glib/setup-hook.sh
View file
Open in desktop
File renamed without changes.
0 ...t/libraries/glib/split-dev-programs.patch → .../by-name/gl/glib/split-dev-programs.patch
View file
Open in desktop
File renamed without changes.
346 changes: 0 additions & 346 deletions pkgs/development/libraries/glib/default.nix
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion pkgs/top-level/all-packages.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9298,7 +9298,7 @@ with pkgs;

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

glib = callPackage ../development/libraries/glib (let
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You can remove this line

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We need to break the dependency cycle. I believe this is the closest thing to a standard way that still allows easily overriding the dependencies.

glib = callPackage ../by-name/gl/glib/package.nix (let
glib-untested = glib.overrideAttrs { doCheck = false; };
in {
# break dependency cycles
Expand Down
Loading