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

opencore-amr init at 0.1.5 #28034

Merged
merged 8 commits into from
Aug 8, 2017
Merged

opencore-amr init at 0.1.5 #28034

merged 8 commits into from
Aug 8, 2017

Conversation

kiloreux
Copy link
Member

@kiloreux kiloreux commented Aug 8, 2017

Motivation for this change

Enable support for libopencore for use inside ffmpeg
https://github.com/NixOS/nixpkgs/blob/master/pkgs/development/libraries/ffmpeg-full/default.nix#L158

Things done

Please check what applies. Note that these are not hard requirements but merely serve as information for reviewers.

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

{stdenv, fetchurl}:

stdenv.mkDerivation {
name = "opencore-amr";
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The name should contain the version in it. Usually something like

let
  version = "0.1.5";
in
stdenv.mkDerivation {
  name = "opencore-amr-${version}";

would be done, also adding the version to the url component in the same way.

@@ -0,0 +1,16 @@
{stdenv, fetchurl}:
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

A nitpick, but spaces are the preferred style: { stdenv, fetchurl }

sha256 = "0hfk9khz3by0119h3jdwgdfd7jgkdbzxnmh1wssvylgnsnwnq01c";
};
meta = {
homepage = https://opencore-amr.sourceforge.io/;
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nitpick: Newlines are appreciated between }; and meta.

@kiloreux
Copy link
Member Author

kiloreux commented Aug 8, 2017

@infinisil I implemented the required changes. Feel free to check and request any other changes.

@@ -4682,6 +4682,8 @@ with pkgs;
openssl = null;
};

opencore-amr = callPackage ../development/libraries/libopencore { };

Copy link
Member

@infinisil infinisil Aug 8, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You should move this to the other libraries in all-packages.nix and sort in it alphabetically. Search for ### to find the Development / Libraries section.

Also you should call it either libopencore or opencore-amr. So either change the package path or change the attribute name. Probably changing the path makes more sense.

@infinisil
Copy link
Member

And when that's done this LGTM :D. Only thing left to do then is squash the commits into a single one

@kiloreux
Copy link
Member Author

kiloreux commented Aug 8, 2017

@infinisil implemented your changes. Feel free to merge 🙂

@LnL7 LnL7 merged commit 8c86ce7 into NixOS:master Aug 8, 2017
@LnL7
Copy link
Member

LnL7 commented Aug 8, 2017

Thanks!

@kiloreux kiloreux deleted the libopencore branch August 8, 2017 17:32
@knedlsepp
Copy link
Member

knedlsepp commented Aug 8, 2017

@kiloreux Now it's too late, but just so you know for your next PR: Infinisil was talking about squashing the commits to match the commit-policy here: https://nixos.org/nixpkgs/manual/#idm140737318169792 which keeps the history cleaner. (A single "opencore-amr: init at 0.1.5")

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants