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

Jump to bottom

flatpak: propagate glib and ostree #80384

Merged
merged 2 commits into from Feb 18, 2020
Merged

flatpak: propagate glib and ostree #80384

merged 2 commits into from Feb 18, 2020

Conversation

worldofpeace
Copy link
Contributor

Pantheon's sideload broke:

meson.build:17:0: ERROR: Could not generate cargs for flatpak:
Package ostree-1 was not found in the pkg-config search path.
Perhaps you should add the directory containing `ostree-1.pc'
to the PKG_CONFIG_PATH environment variable
Package 'ostree-1', required by 'flatpak', not found

https://hydra.nixos.org/build/113077888

ZHF: #80379

Motivation for this change
Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS linux)
  • 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 nixpkgs-review --run "nixpkgs-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Determined the impact on package closure size (by running nix path-info -S before and after)
  • Ensured that relevant documentation is up to date
  • Fits CONTRIBUTING.md.

@worldofpeace
flatpak: propagate glib and ostree
461ea02 
Pantheon's sideload broke:
```
meson.build:17:0: ERROR: Could not generate cargs for flatpak:
Package ostree-1 was not found in the pkg-config search path.
Perhaps you should add the directory containing `ostree-1.pc'
to the PKG_CONFIG_PATH environment variable
Package 'ostree-1', required by 'flatpak', not found
```

https://hydra.nixos.org/build/113077888

ZHF: NixOS#80379
@worldofpeace worldofpeace added the 9.needs: port to stable A PR needs a backport to the stable release. label Feb 17, 2020
@worldofpeace
Copy link
Contributor Author

@GrahamcOfBorg build pantheon.sideload

@worldofpeace
Copy link
Contributor Author

@GrahamcOfBorg build pantheon.appcenter

https://hydra.nixos.org/build/112536617

@worldofpeace worldofpeace added this to the 20.03 milestone Feb 17, 2020
@jtojnar
Copy link
Contributor

jtojnar commented Feb 18, 2020 •
edited

Perhaps we should add dev output? Otherwise it propagates glib.dev into runtime closure.

@worldofpeace
Copy link
Contributor Author

Perhaps we should add dev output? Otherwise it propagates glib.dev into runtime closure.

Done.

@worldofpeace worldofpeace merged commit 6f0cb03 into NixOS:master Feb 18, 2020
@worldofpeace worldofpeace deleted the flatpak-ostree branch February 18, 2020 00:39
@worldofpeace
Copy link
Contributor Author

backported to 20.03 in 4603e70 and 33ce841

@worldofpeace worldofpeace added 8.has: port to stable A PR already has a backport to the stable release. and removed 9.needs: port to stable A PR needs a backport to the stable release. labels Feb 18, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jtojnar jtojnar jtojnar approved these changes

Assignees
No one assigned
Labels
8.has: port to stable A PR already has a backport to the stable release. 10.rebuild-darwin: 0 10.rebuild-linux: 1-10
Projects
None yet
Milestone
20.03
Development

Successfully merging this pull request may close these issues.

None yet
2 participants
@worldofpeace @jtojnar