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.

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

gnome3.gsettings_desktop_schemas: do not depend on gnome-backgrounds #31991

Merged
merged 1 commit into from Nov 27, 2017

Conversation

jtojnar
Copy link
Contributor

@jtojnar jtojnar commented Nov 23, 2017

Motivation for this change

We intend to make all GTK apps depend on the desktop schemas (#31891). Since the schemas depend on gnome-backgrounds to determine the default wallpaper path, it would increase the closure size significantly for smaller apps.

We could split out the org.gnome.desktop.background and screensaver schemas but that would make the packaging unnecessarily complicated. Instead we remove the backgrounds dependency since they are not used (outside of GNOME) or they will be replaced by a different set by the NixOS module. There will be no background when running GNOME manually but that can be easily fixed.

See also #29766

Things done

I tested it with both GNOME 3.24 and GNOME 3.26.

  • Tested using sandboxing (nix.useSandbox on NixOS, or option build-use-sandbox in nix.conf on non-NixOS)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nox --run "nox-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Fits CONTRIBUTING.md.

We intend to make all GTK apps depend on the desktop schemas. Since
the schemas depend on gnome-backgrounds to determine the default
wallpaper path, it would increase the closure size significantly
for smaller apps.

We could split out the org.gnome.desktop.background and screensaver
schemas but that would make the packaging unnecessarily complicated.
Instead we remove the backgrounds dependency since they are not used
(outside of GNOME) or they will be replaced by a different set by
the NixOS module. There will be no background when running GNOME
manually but that can be easily fixed.
@jtojnar jtojnar added the 6.topic: GNOME GNOME desktop environment and its underlying platform label Nov 23, 2017
@jtojnar jtojnar changed the title gnome3.gsettings_desktop_schemas: do not rely on gnome-backgrounds gnome3.gsettings_desktop_schemas: do not depend on gnome-backgrounds Nov 23, 2017
@jtojnar
Copy link
Contributor Author

jtojnar commented Nov 23, 2017

@GrahamcOfBorg build gnome3.gsettings_desktop_schemas

Copy link

@GrahamcOfBorg GrahamcOfBorg left a comment

Choose a reason for hiding this comment

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

Success for system: x86_64-darwin

make[2]: Nothing to be done for 'install-exec-am'.
 /nix/store/s4sagzgijfbil29dgyxcv24pip8na49k-coreutils-8.28/bin/mkdir -p '/nix/store/xjifz5dmwv8hcyk2by8d45dns7jh70s3-gsettings-desktop-schemas-3.24.0/share/pkgconfig'
 /nix/store/s4sagzgijfbil29dgyxcv24pip8na49k-coreutils-8.28/bin/install -c -m 644 gsettings-desktop-schemas.pc '/nix/store/xjifz5dmwv8hcyk2by8d45dns7jh70s3-gsettings-desktop-schemas-3.24.0/share/pkgconfig'
make[2]: Leaving directory '/private/tmp/nix-build-gsettings-desktop-schemas-3.24.0.drv-0/gsettings-desktop-schemas-3.24.0'
make[1]: Leaving directory '/private/tmp/nix-build-gsettings-desktop-schemas-3.24.0.drv-0/gsettings-desktop-schemas-3.24.0'
glibPreFixupPhase
post-installation fixup
stripping (with flags -S) in /nix/store/xjifz5dmwv8hcyk2by8d45dns7jh70s3-gsettings-desktop-schemas-3.24.0/lib
patching script interpreter paths in /nix/store/xjifz5dmwv8hcyk2by8d45dns7jh70s3-gsettings-desktop-schemas-3.24.0
/nix/store/xjifz5dmwv8hcyk2by8d45dns7jh70s3-gsettings-desktop-schemas-3.24.0

Copy link

@GrahamcOfBorg GrahamcOfBorg left a comment

Choose a reason for hiding this comment

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

Success for system: x86_64-linux

 /nix/store/0abay33zgwqgchdzzq6h88ac4963smwf-coreutils-8.28/bin/install -c -m 644 gsettings-desktop-schemas.pc '/nix/store/r2znb4izi4snahg3l34c5j01na1z4vz9-gsettings-desktop-schemas-3.24.0/share/pkgconfig'
make[2]: Leaving directory '/tmp/nix-build-gsettings-desktop-schemas-3.24.0.drv-0/gsettings-desktop-schemas-3.24.0'
make[1]: Leaving directory '/tmp/nix-build-gsettings-desktop-schemas-3.24.0.drv-0/gsettings-desktop-schemas-3.24.0'
glibPreFixupPhase
post-installation fixup
shrinking RPATHs of ELF executables and libraries in /nix/store/r2znb4izi4snahg3l34c5j01na1z4vz9-gsettings-desktop-schemas-3.24.0
stripping (with flags -S) in /nix/store/r2znb4izi4snahg3l34c5j01na1z4vz9-gsettings-desktop-schemas-3.24.0/lib 
patching script interpreter paths in /nix/store/r2znb4izi4snahg3l34c5j01na1z4vz9-gsettings-desktop-schemas-3.24.0
checking for references to /tmp/nix-build-gsettings-desktop-schemas-3.24.0.drv-0 in /nix/store/r2znb4izi4snahg3l34c5j01na1z4vz9-gsettings-desktop-schemas-3.24.0...
/nix/store/r2znb4izi4snahg3l34c5j01na1z4vz9-gsettings-desktop-schemas-3.24.0

@jtojnar jtojnar changed the base branch from master to staging November 24, 2017 15:46
@jtojnar jtojnar added this to Ready in GNOME Nov 25, 2017
@orivej
Copy link
Contributor

orivej commented Nov 26, 2017

There will be no background when running GNOME manually but that can be easily fixed.

Could you explain the consequences in more detail? What is running GNOME manually?

@jtojnar
Copy link
Contributor Author

jtojnar commented Nov 26, 2017

Basically starting it without display manager, not using the NixOS service, just installing gnome_shell and trying to run it from tty. Not sure if that would even work.

@vcunat vcunat merged commit 9c7a06d into NixOS:staging Nov 27, 2017
GNOME automation moved this from Ready to Done Nov 27, 2017
vcunat added a commit that referenced this pull request Nov 27, 2017
do not depend on gnome-backgrounds
@jtojnar jtojnar deleted the eschew-backrounds branch November 27, 2017 13:55
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
GNOME
  
Done
Development

Successfully merging this pull request may close these issues.

None yet

4 participants