Skip to content

apvlv: copy main_menubar.glade to out dir #26368

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

Merged
merged 1 commit into from
Jun 4, 2017

Conversation

vidbina
Copy link
Contributor

@vidbina vidbina commented Jun 4, 2017

Motivation for this change

The application relies on main_menubar.glade to generate part of the GTK-based UI.

Currently apvlv fails with the (apvlv:16999): Gtk-ERROR **: failed to add UI: Failed to open file '${NIX_PREFIX}-apvlv-0.1.5/share/doc/apvlv/main_menubar.glade': No such file or directory zsh: trace trap apvlv error because this file is copied into the output directory for the package.

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
    • Linux
  • 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.

TL;DR

Added the apvlv package to my nixos-configuration and ended up with an error message that indicated a missing main_menubar.glade file. After initially writing an override for my own setup, I decide to add the cp command for the required file to the installPhase in the nixpkgs description. Built this against my nixos-version to confirm it works, subsequently against release-17.03 9e0a260 (which took forever to nixos-rebuild test) then failed because git.efa3635.drv couldn't be built and finally cherry-picked the commit of interest into master.

Tried to rebase, but there were so many conflicts that pursuing of this approach seemed disproportionate to the minor (single line append) change. If I must rebase, I am glad to receive some pointers on how to perform this without introducing a significant risk of breaking changes elsewhere in nixpkgs.

Sorry, something went wrong.

The application requires the main_menubar.glade alongside the
Startup.pdf. Just making sure all required assets are present 😉.

Currently `apvlv` fails with the `(apvlv:16999): Gtk-ERROR **: failed to add UI: Failed to open file '${store-path}-apvlv-0.1.5/share/doc/apvlv/main_menubar.glade': No such file or directory
zsh: trace trap  apvlv` error.
@mention-bot
Copy link

@vidbina, thanks for your PR! By analyzing the history of the files in this pull request, we identified @globin and @ardumont to be potential reviewers.

vidbina added a commit to vidbina/nixos-configuration that referenced this pull request Jun 4, 2017
@Mic92 Mic92 merged commit 7502205 into NixOS:master Jun 4, 2017
@Mic92
Copy link
Member

Mic92 commented Jun 4, 2017

While using git rebase is in theory possible, it is much easier to use git cherry-pick.
This is usually done by the maintainers of nixpkgs and not by the contributors.
The workflow looks like the following (for a maintainer):

git fetch upstream release-17.03 # upstream git remote points to github.com/NixOS/nixpkgs on my system
git checkout upstream/release-17.03
git cherry-pick -x <commit hash>
git push upstream HEAD:release-17.03

@Mic92
Copy link
Member

Mic92 commented Jun 4, 2017

back ported in f7c081b

@Mic92
Copy link
Member

Mic92 commented Jun 4, 2017

wrapGAppsHook was also missing, fixed in 8ddf6f9

Otherwise it crashes when a file dialog is opened.

@vidbina
Copy link
Contributor Author

vidbina commented Jun 4, 2017

Thanks for 8ddf6f9. I missed that since I didn't use any dialogs during my test. I'll employ more rigor publiishing subsequent PR's 😉

@Janik-Haag Janik-Haag added the 12. first-time contribution This PR is the author's first one; please be gentle! label Jun 12, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
12. first-time contribution This PR is the author's first one; please be gentle!
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants