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

firefox: fix wrapper to make proper symlink to icon #38515

Merged
merged 1 commit into from Apr 8, 2018
Merged

firefox: fix wrapper to make proper symlink to icon #38515

merged 1 commit into from Apr 8, 2018

Conversation

taku0
Copy link
Contributor

@taku0 taku0 commented Apr 6, 2018

Motivation for this change

The symbolic link /nix/store/...-firefox-bin-59.0.2/share/icons/hicolor/128x128/apps/firefox.png points to /nix/store/...-firefox-release-bin-unwrapped-59.0.2/lib/firefox/browser/chrome/icons/default/default128.png, but it should be /nix/store/...-firefox-release-bin-unwrapped-59.0.2/lib/firefox-bin-59.0.2/browser/chrome/icons/default/default128.png.

Because of this, nix-env -i firefox-bin results in error with 18.03.

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
Copy link
Contributor

jtojnar commented Apr 6, 2018

This was recently changed by @ttuegel in #37636

@ttuegel
Copy link
Member

ttuegel commented Apr 6, 2018

So... firefox uses the lib/firefox prefix, but firefox-bin appends the version. Great.

@mpickering mpickering mentioned this pull request Apr 6, 2018
Closed
8 tasks
@Mic92 Mic92 merged commit 39eaf98 into NixOS:master Apr 8, 2018
@crawford
Copy link
Contributor

crawford commented Jun 4, 2018

Does this need to be backported to 18.03? (mozilla/nixpkgs-mozilla#95)

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
10.rebuild-darwin: 0 10.rebuild-linux: 1-10
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
6 participants
@taku0 @jtojnar @ttuegel @crawford @Mic92 @GrahamcOfBorg