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

@peterhoeg peterhoeg commented Oct 2, 2020

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";

This comment has been minimized.

@worldofpeace

worldofpeace Oct 2, 2020
Member

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

fix
@peterhoeg
Copy link
Member Author

@peterhoeg peterhoeg commented Oct 2, 2020

@Synthetica9
Copy link
Contributor

@Synthetica9 Synthetica9 commented Oct 2, 2020

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
17 checks passed
17 checks passed
tests tests
Details
action
Details
Evaluation Performance Report Evaluator Performance Report
Details
Wait for ofborg
Details
grahamcofborg-eval ^.^!
Details
grahamcofborg-eval-check-maintainers matching changed paths to changed attrs...
Details
grahamcofborg-eval-check-meta config.nix: checkMeta = true
Details
grahamcofborg-eval-darwin nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="1e4568d"; rev="1e4568dde9f9dcadf578403a5492cf4b04ba10d5"; } ./pkgs/t
Details
grahamcofborg-eval-lib-tests nix-build --arg pkgs import ./. {} ./lib/tests/release.nix
Details
grahamcofborg-eval-nixos nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="1e4568d"; rev="1e4568dde9f9dcadf578403a5492cf4b04ba10d5"; } ./nixos/
Details
grahamcofborg-eval-nixos-manual nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="1e4568d"; rev="1e4568dde9f9dcadf578403a5492cf4b04ba10d5"; } ./nixos/
Details
grahamcofborg-eval-nixos-options nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="1e4568d"; rev="1e4568dde9f9dcadf578403a5492cf4b04ba10d5"; } ./nixos/
Details
grahamcofborg-eval-nixpkgs-manual nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="1e4568d"; rev="1e4568dde9f9dcadf578403a5492cf4b04ba10d5"; } ./pkgs/t
Details
grahamcofborg-eval-nixpkgs-tarball nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="1e4568d"; rev="1e4568dde9f9dcadf578403a5492cf4b04ba10d5"; } ./pkgs/t
Details
grahamcofborg-eval-nixpkgs-unstable-jobset nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="1e4568d"; rev="1e4568dde9f9dcadf578403a5492cf4b04ba10d5"; } ./pkgs/t
Details
grahamcofborg-eval-package-list nix-env -qa --json --file .
Details
grahamcofborg-eval-package-list-no-aliases nix-env -qa --json --file . --arg config { allowAliases = false; }
Details
@peterhoeg peterhoeg deleted the peterhoeg:f/vlc branch Oct 5, 2020
@peterhoeg peterhoeg restored the peterhoeg:f/vlc branch Oct 6, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

None yet

3 participants
You can’t perform that action at this time.