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.

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

firefox: add u2f support #42547

Merged
merged 1 commit into from
Jun 25, 2018
Merged

firefox: add u2f support #42547

merged 1 commit into from
Jun 25, 2018

Conversation

tadfisher
Copy link
Contributor

@tadfisher tadfisher commented Jun 25, 2018

Motivation for this change

#34747

Firefox uses pkg-config to locate libudev, silently failing to enable U2F support if it is not available.

This makes libudev always available via the wrapper script.

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option 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/)
  • Determined the impact on package closure size (by running nix path-info -S before and after)
  • Fits CONTRIBUTING.md.

@GrahamcOfBorg GrahamcOfBorg added 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild 10.rebuild-linux: 1-10 labels Jun 25, 2018
@xeji
Copy link
Contributor

xeji commented Jun 25, 2018

@GrahamcOfBorg build firefox-wrapper

@GrahamcOfBorg
Copy link

Success on x86_64-linux (full log)

Attempted: firefox-wrapper

Partial log (click to expand)

  /nix/store/jd9xcgbly8rcy3yzzy4mhmahv265grbf-librsvg-2.42.4
  /nix/store/vjq2h9ry2jc9rc064mabh2pfcr394k6h-firefox.desktop
  /nix/store/wh1r5i7w9c2ygw8kh4an1igzg13l534n-firefox-unwrapped-60.0.2
copying path '/nix/store/vjq2h9ry2jc9rc064mabh2pfcr394k6h-firefox.desktop' from 'https://cache.nixos.org'...
copying path '/nix/store/2bqrxp8j4ax2ka5car249bb8jdnh3rvm-adwaita-icon-theme-3.28.0' from 'https://cache.nixos.org'...
copying path '/nix/store/2ryzkjf39xf3d9j6lxmgn859ai99lnwk-libcanberra-0.30' from 'https://cache.nixos.org'...
copying path '/nix/store/jd9xcgbly8rcy3yzzy4mhmahv265grbf-librsvg-2.42.4' from 'https://cache.nixos.org'...
copying path '/nix/store/wh1r5i7w9c2ygw8kh4an1igzg13l534n-firefox-unwrapped-60.0.2' from 'https://cache.nixos.org'...
building '/nix/store/pjhm66fslm6bb5vp0nxw6a9llbaa6l5g-firefox-60.0.2.drv'...
/nix/store/r80i3l998wv8vs0ifp7h6fi4ajqwzpf1-firefox-60.0.2

@GrahamcOfBorg
Copy link

No attempt on x86_64-darwin (full log)

The following builds were skipped because they don't evaluate on x86_64-darwin: firefox-wrapper

Partial log (click to expand)


a) For `nixos-rebuild` you can set
  { nixpkgs.config.allowUnsupportedSystem = true; }
in configuration.nix to override this.

b) For `nix-env`, `nix-build`, `nix-shell` or any other Nix command you can add
  { allowUnsupportedSystem = true; }
to ~/.config/nixpkgs/config.nix.


@xeji xeji merged commit 9595dc5 into NixOS:master Jun 25, 2018
@GrahamcOfBorg
Copy link

Failure on aarch64-linux (full log)

Attempted: firefox-wrapper

Partial log (click to expand)

'+fp' is not a recognized feature for this target (ignoring feature)
   Compiling gkrust-shared v0.1.0 (file:///build/firefox-60.0.2/toolkit/library/rust/shared)
'+fp' is not a recognized feature for this target (ignoring feature)
'+fp' is not a recognized feature for this target (ignoring feature)
   Compiling gkrust v0.1.0 (file:///build/firefox-60.0.2/toolkit/library/rust)
'+fp' is not a recognized feature for this target (ignoring feature)
'+fp' is not a recognized feature for this target (ignoring feature)
building of '/nix/store/7qlpaihz16gp9gq6klxzyalvr7l0x6y0-firefox-unwrapped-60.0.2.drv' timed out after 3600 seconds
cannot build derivation '/nix/store/nxgcnajn7f3dfh33sc81lfxlwhnfram0-firefox-60.0.2.drv': 1 dependencies couldn't be built
error: build of '/nix/store/nxgcnajn7f3dfh33sc81lfxlwhnfram0-firefox-60.0.2.drv' failed

@vcunat
Copy link
Member

vcunat commented Jul 6, 2018

Has someone tested U2F on 18.03? (I don't have an U2F device ATM.)

@grahamc
Copy link
Member

grahamc commented Jul 11, 2018

Backported in 411cc55 and works.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
10.rebuild-darwin: 0 This PR does not cause any packages to rebuild 10.rebuild-linux: 1-10
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants