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

audacity: 2.1.2 -> 2.1.3 #29179

Merged
merged 1 commit into from Sep 10, 2017
Merged

audacity: 2.1.2 -> 2.1.3 #29179

merged 1 commit into from Sep 10, 2017

Conversation

matthiasbeyer
Copy link
Contributor

Motivation for this change

2.1.2 fails with "Assertion failed" when recording, so I want to try an update.

Unfortunately this does not build yet. Maybe the maintainer @the-kenny can help me here?

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

@mention-bot
Copy link

@matthiasbeyer, thanks for your PR! By analyzing the history of the files in this pull request, we identified @abbradar, @peterhoeg and @7c6f434c to be potential reviewers.

@matthiasbeyer
Copy link
Contributor Author

Removing the second patch gets me to

configure: error: You requested using the local libraries for FFMPEG but they are not available
builder for ‘/nix/store/bk1k7jksqb9mc764glk89yy50c5yk9gf-audacity-2.1.3.drv’ failed with exit code 1
error: build of ‘/nix/store/bk1k7jksqb9mc764glk89yy50c5yk9gf-audacity-2.1.3.drv’ failed

which seems to be one step closer if I interpret that correctly? Not sure.

@the-kenny
Copy link
Contributor

One solution would be throwing out the first four lines in preConfigure which will cause audacity to use the bundled ffmpeg etc. I'm not sure if that's a nice solution, but it's a solution.

Right now I'm trying the build where I run autoreconf in preConfigure like arch does: https://git.archlinux.org/svntogit/packages.git/tree/trunk/PKGBUILD?h=packages/audacity

This seems to make audacity use the system libraries. You need to add autoconf automake libtool to buildInputs for this to work.

@the-kenny
Copy link
Contributor

The autoreconf -vi thing seems to work here, I get a 2.1.3 audacity (from this branch) which is linked against the system's ffmpeg libs (among others).

@matthiasbeyer
Copy link
Contributor Author

Okay, with these changes applied my build is running now. Although I had to remove the patch as mentioned earlier. Will push my changes for you to review as soon as my build succeeded! Thanks for your suggestions!

@matthiasbeyer
Copy link
Contributor Author

@the-kenny Changes pushed. I mentioned you in 2432ca1! I guess you would like me to squash all changes into one commit - if you want to, I can do that (and keep you in the Suggested-by trailer, of course).

@the-kenny
Copy link
Contributor

LGTM. Squashing would be nice, thanks in advance!

@matthiasbeyer
audacity: 2.1.2 -> 2.1.3
fd1e362 
* Remove gcc-6 patch to make it compile
* Add autoreconf call in preConfigure phase
  Inspired by
  https://git.archlinux.org/svntogit/packages.git/tree/trunk/PKGBUILD?h=packages/audacity

Suggested-by: Moritz Ulrich <moritz@tarn-vedra.de>
@Mic92 Mic92 merged commit accb333 into NixOS:master Sep 10, 2017
@Mic92
Copy link
Member

Mic92 commented Sep 10, 2017

Thanks!

@matthiasbeyer matthiasbeyer deleted the update-audacity branch September 10, 2017 14:16
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
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
4 participants
@matthiasbeyer @mention-bot @the-kenny @Mic92