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

calibre: fix build of desktop items #84095

Merged
merged 1 commit into from Apr 2, 2020
Merged

calibre: fix build of desktop items #84095

merged 1 commit into from Apr 2, 2020

Conversation

timokau
Copy link
Member

@timokau timokau commented Apr 2, 2020 •
edited

Motivation for this change

Broken by #75729 since the desktop
items are only valid after post-processing. There's probably multiple
better ways to do this, but I'm not a calibre maintainer and I just want
to get this unbroken as quickly as possible.

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.

@timokau
calibre: fix build of desktop items
3f76ce2 
Broken by NixOS#75729 since the desktop
items are only valid after post-processing. There's probably multiple
better ways to do this, but I'm not a calibre maintainer and I just want
to get this unbroken as quickly as possible.
@timokau timokau mentioned this pull request Apr 2, 2020
Merged
10 tasks
@worldofpeace
Copy link
Contributor

This is the second error I've seen like this. I think I could find a way to suppress this particular error with the placeholders. This PR is fine though.

@worldofpeace
Copy link
Contributor

The proper solution here would be to actually install the icons into the correct directory.
This is what fedora does:

This is the failing check for the icons:

Glancing at the source, I don't think the exec key will be a problem for the validator.

@timokau
Copy link
Member Author

timokau commented Apr 2, 2020

In the spirit of unbreaking calibre on master ASAP, I'll merge this for now. I'm glad you're looking into better solutions though.

@timokau timokau merged commit addac63 into NixOS:master Apr 2, 2020
@timokau timokau deleted the calibre-unbreak-desktop branch April 2, 2020 11:35
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@domenkozar domenkozar Awaiting requested review from domenkozar

@pSub pSub Awaiting requested review from pSub

@AndersonTorres AndersonTorres Awaiting requested review from AndersonTorres

Assignees
No one assigned
Labels
10.rebuild-darwin: 0 10.rebuild-linux: 1-10 10.rebuild-linux: 1
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
2 participants
@timokau @worldofpeace