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

vlc: change name for library only version #99346

Merged
merged 2 commits into from Oct 5, 2020
Merged

Conversation

peterhoeg
Copy link
Member

Motivation for this change

Very minor cleanup, but it does make nix-store --query --referrers
easier to grok when both the library and actual application are showing.

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS linux)
  • 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 nixpkgs-review --run "nixpkgs-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)
  • Ensured that relevant documentation is up to date
  • Fits CONTRIBUTING.md.

@peterhoeg peterhoeg changed the title f/vlc: change name for library only version vlc: change name for library only version Oct 2, 2020
@@ -24,7 +24,7 @@ with stdenv.lib;
assert (withQt5 -> qtbase != null && qtsvg != null && qtx11extras != null && wrapQtAppsHook != null);

stdenv.mkDerivation rec {
pname = "vlc";
pname = "${optionalString onlyLibVLC "lib"}vlc";
Copy link
Contributor

Choose a reason for hiding this comment

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

won't this break the download below since it uses pname for the archive?

@peterhoeg
Copy link
Member Author

peterhoeg commented Oct 2, 2020 via email

@Synthetica9
Copy link
Member

Absolutely - what on earth did I compile then....

Fixed.

The archive isn't re-downloaded when the url changes; only when the sha256 changes.

@peterhoeg peterhoeg merged commit a28d355 into NixOS:master Oct 5, 2020
@peterhoeg peterhoeg deleted the f/vlc branch October 5, 2020 03:37
@peterhoeg peterhoeg restored the f/vlc branch October 6, 2020 14:16
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

3 participants