Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
base: 6bd73e860beb
Choose a base ref
...
head repository: NixOS/nixpkgs
compare: a112f16a75af
Choose a head ref
  • 2 commits
  • 4 files changed
  • 2 contributors

Commits on Jun 25, 2018

  1. Use a NixOS module for generating the gdk-pixbuf loaders cache.

    Fixes issue #33231 and makes it possible to enable Plasma and KDE at the same time.
    
    Previously, this worked like this:
    - The gdk-pixbuf package comes with a cache file covering the modules bundled
      with gdk-pixbuf.
    - The librsvg package comes with a cache covering modules from gdk-pixbuf as
      well as librsvg.
    - plasma5 and xfce modules set the environment variable GDK_PIXBUF_MODULE_FILE
      to the one from librsvg, so that SVG was supported in addition to the
      formats supported by gdk-pixbuf. However if both were enabled a configuration
      conflict would result (despite setting to the same value).
    
    While this sort of worked (ignoring the conflict which perhaps could be hacked
    around), it is unscalable and a hack, as there would be a real problem when one
    wanted to add a third package that supports additional image formats.
    
    A new NixOS module (gdk-pixbuf) is added with a configuration option
    (modulePackages) that other modules use to request specific packages to be
    included in the loaders cache. When any package is present in the list, the
    module generates a system-wide loaders cache which includes the requested
    packages (and always gdk-pixbuf itself), and sets the environment variable
    GDK_PIXBUF_MODULE_FILE to point to the generated cache file.
    
    The plasma5 and xfce modules are updated to add librsvg to modulePackages
    instead of setting GDK_PIXBUF_MODULE_FILE.
    
    Note that many packages create wrappers that set GDK_PIXBUF_MODULE_FILE,
    some directly to the one from librsvg. Therefore this change does not
    change the existing hack in the librsvg package which ensures that
    file is generated. This change aims only to solve the conflict in the
    global environent variable configuration.
    ambrop72 committed Jun 25, 2018
    Configuration menu
    Copy the full SHA
    d9fa88d View commit details
    Browse the repository at this point in the history

Commits on Oct 12, 2018

  1. Merge pull request #42562 from ambrop72/gdk-pixbuf-fix

    Use a NixOS module for generating the gdk-pixbuf loaders cache.
    jtojnar committed Oct 12, 2018
    Configuration menu
    Copy the full SHA
    a112f16 View commit details
    Browse the repository at this point in the history