Skip to content

Cheese fixes#32246

Merged
jtojnar merged 10 commits intoNixOS:masterfrom
jtojnar:cheese-fixes
Dec 2, 2017
Merged

Cheese fixes#32246
jtojnar merged 10 commits intoNixOS:masterfrom
jtojnar:cheese-fixes

Conversation

@jtojnar
Copy link
Member

@jtojnar jtojnar commented Dec 2, 2017

Motivation for this change
Things done
  • 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.

@jtojnar jtojnar added 0.kind: bug Something is broken 0.kind: enhancement Add something new or improve an existing system. 2.status: work-in-progress 6.topic: GNOME GNOME desktop environment and its underlying platform 8.has: package (update) This PR updates a package to a newer version labels Dec 2, 2017
@GrahamcOfBorg GrahamcOfBorg added 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin. 10.rebuild-linux: 1-10 This PR causes between 1 and 10 packages to rebuild on Linux. labels Dec 2, 2017
@GrahamcOfBorg GrahamcOfBorg added 10.rebuild-linux: 11-100 This PR causes between 11 and 100 packages to rebuild on Linux. and removed 10.rebuild-linux: 1-10 This PR causes between 1 and 10 packages to rebuild on Linux. labels Dec 2, 2017
@jtojnar jtojnar mentioned this pull request Dec 2, 2017
71 tasks
Copy link
Member Author

Choose a reason for hiding this comment

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

Is binding /nix enough or should I rather bind /nix/store?

Copy link
Contributor

Choose a reason for hiding this comment

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

Since /nix/var is not needed, we should rather bind /nix/store.

Copy link
Member Author

@jtojnar jtojnar Dec 2, 2017

Choose a reason for hiding this comment

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

It this use of passthru okay?

Copy link
Contributor

Choose a reason for hiding this comment

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

I think yes.

We are patching the xmlcatalog calls in the JH_CHECK_XML_CATALOG
macro to use the XML_CATALOG_FILES environment variable instead
of a single central catalog file. Since consumers (libraries or
applications) are expected to copy the m4 files to their source
tree, we need to patch them separately. The files should be
identical, though, so we can reuse the patch for gtk_doc.

This commit makes the patch available in passthru so the consumer
expressions do not need to maintain the long relative path.
Without thumbnailers available, cheese loops endlessly.

NixOS#15790
@jtojnar jtojnar merged commit e53ebf3 into NixOS:master Dec 2, 2017
@jtojnar jtojnar deleted the cheese-fixes branch December 2, 2017 22:14
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

0.kind: bug Something is broken 0.kind: enhancement Add something new or improve an existing system. 6.topic: GNOME GNOME desktop environment and its underlying platform 8.has: package (update) This PR updates a package to a newer version 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin. 10.rebuild-linux: 11-100 This PR causes between 11 and 100 packages to rebuild on Linux.

Projects

Status: Done

Development

Successfully merging this pull request may close these issues.

3 participants