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

dump1090: fix html path #33255

Closed
wants to merge 1 commit into from
Closed

dump1090: fix html path #33255

wants to merge 1 commit into from

Conversation

lasandell
Copy link
Contributor

Motivation for this change

Running dump1090 --net and navigating to port 8080 does not work because the makeFlags were incorrectly specified, causing the program to look in ut/share/dump1090 for its HTML resources. The makeFlags are escaped but not expanded, so they need to use the parenthesized variable syntax required by GNU Make.

I also added the view1090 binary to the package output. This should be run after dump1090 --net is started.

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.

@lasandell
dump1090: fix html path
50524a9 
Use correct variable syntax for GNU Make so that HTML resources
can be found when running `dump1090 --net`. Additionally, add
view1090 binary to output.
@grahamc
Copy link
Member

grahamc commented Feb 6, 2018

@GrahamcOfBorg eval
@GrahamcOfBorg build dump1090

@GrahamcOfBorg
Copy link

Failure on x86_64-darwin (full log)

Partial log (click to expand)

Package ‘dump1090-2014-10-31’ in /private/var/lib/ofborg/checkout/repo/38dca4e3aa6bca43ea96d2fcc04e8229/builder/lnl7-mac/pkgs/applications/misc/dump1090/default.nix:27 is not supported on ‘x86_64-darwin’, refusing to evaluate.

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

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

@GrahamcOfBorg
Copy link

Success on x86_64-linux (full log)

Partial log (click to expand)

'public_html/style.css' -> '/nix/store/982wnjs8dy6f73v718w4p6m4q52fa9zx-dump1090-2014-10-31/share/dump1090/style.css'
post-installation fixup
shrinking RPATHs of ELF executables and libraries in /nix/store/982wnjs8dy6f73v718w4p6m4q52fa9zx-dump1090-2014-10-31
shrinking /nix/store/982wnjs8dy6f73v718w4p6m4q52fa9zx-dump1090-2014-10-31/bin/dump1090
shrinking /nix/store/982wnjs8dy6f73v718w4p6m4q52fa9zx-dump1090-2014-10-31/bin/view1090
strip is /nix/store/5qj61lcvzlap87rf6blvf8p577d482bv-binutils-2.28.1/bin/strip
stripping (with command strip and flags -S) in /nix/store/982wnjs8dy6f73v718w4p6m4q52fa9zx-dump1090-2014-10-31/bin 
patching script interpreter paths in /nix/store/982wnjs8dy6f73v718w4p6m4q52fa9zx-dump1090-2014-10-31
checking for references to /tmp/nix-build-dump1090-2014-10-31.drv-0 in /nix/store/982wnjs8dy6f73v718w4p6m4q52fa9zx-dump1090-2014-10-31...
/nix/store/982wnjs8dy6f73v718w4p6m4q52fa9zx-dump1090-2014-10-31

@GrahamcOfBorg
Copy link

Success on aarch64-linux (full log)

Partial log (click to expand)

'public_html/style.css' -> '/nix/store/cz93rq697zv728i7yzy9b9gv20iarvic-dump1090-2014-10-31/share/dump1090/style.css'
post-installation fixup
shrinking RPATHs of ELF executables and libraries in /nix/store/cz93rq697zv728i7yzy9b9gv20iarvic-dump1090-2014-10-31
shrinking /nix/store/cz93rq697zv728i7yzy9b9gv20iarvic-dump1090-2014-10-31/bin/view1090
shrinking /nix/store/cz93rq697zv728i7yzy9b9gv20iarvic-dump1090-2014-10-31/bin/dump1090
strip is /nix/store/xmpjypwjmp2qi1chs5kr0hacnh161ls4-binutils-2.28.1/bin/strip
stripping (with command strip and flags -S) in /nix/store/cz93rq697zv728i7yzy9b9gv20iarvic-dump1090-2014-10-31/bin
patching script interpreter paths in /nix/store/cz93rq697zv728i7yzy9b9gv20iarvic-dump1090-2014-10-31
checking for references to /build in /nix/store/cz93rq697zv728i7yzy9b9gv20iarvic-dump1090-2014-10-31...
/nix/store/cz93rq697zv728i7yzy9b9gv20iarvic-dump1090-2014-10-31

@bjornfor
Copy link
Contributor

bjornfor commented Feb 6, 2018

Applied to master (4de7e5c). Thanks!

@bjornfor bjornfor closed this Feb 6, 2018
@lasandell lasandell deleted the dump1090-path-fix branch February 15, 2022 12:23
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@bjornfor bjornfor bjornfor approved these changes

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
4 participants
@lasandell @grahamc @GrahamcOfBorg @bjornfor