Skip to content

libvlc: fix build#156883

Merged
mweinelt merged 1 commit intoNixOS:masterfrom
helsinki-systems:fix/libvlc
Jan 26, 2022
Merged

libvlc: fix build#156883
mweinelt merged 1 commit intoNixOS:masterfrom
helsinki-systems:fix/libvlc

Conversation

@ajs124
Copy link
Member

@ajs124 ajs124 commented Jan 26, 2022

Motivation for this change

#155725

Things done
  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandbox = true set in nix.conf? (See Nix manual)
  • Tested, as applicable:
  • Tested compilation of all packages that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage
  • Tested basic functionality of all binary files (usually in ./result/bin/)
  • 22.05 Release Notes (or backporting 21.11 Release notes)
    • (Package updates) Added a release notes entry if the change is major or breaking
    • (Module updates) Added a release notes entry if the change is significant
    • (Module addition) Added a release notes entry if adding a new NixOS module
    • (Release notes changes) Ran nixos/doc/manual/md-to-db.sh to update generated release notes
  • Fits CONTRIBUTING.md.

@ajs124 ajs124 requested a review from AndersonTorres January 26, 2022 17:14
@ofborg ofborg bot added 10.rebuild-darwin: 1-10 This PR causes between 1 and 10 packages to rebuild on Darwin. 10.rebuild-linux: 11-100 This PR causes between 11 and 100 packages to rebuild on Linux. labels Jan 26, 2022
@mweinelt mweinelt added the 1.severity: channel blocker Blocks a channel label Jan 26, 2022
@mweinelt mweinelt merged commit c34ea78 into NixOS:master Jan 26, 2022
@mweinelt mweinelt removed the 1.severity: channel blocker Blocks a channel label Jan 26, 2022
@ajs124 ajs124 deleted the fix/libvlc branch January 26, 2022 22:33
@github-actions
Copy link
Contributor

Backport failed for release-21.11, because it was unable to cherry-pick the commit(s).

Please cherry-pick the changes locally.

git fetch origin release-21.11
git worktree add -d .worktree/backport-156883-to-release-21.11 origin/release-21.11
cd .worktree/backport-156883-to-release-21.11
git checkout -b backport-156883-to-release-21.11
ancref=$(git merge-base f9a214044be750fb8e186b21e4dbe90ad2e2c0b2 59539a3d3e7a5e263747bdf03ca8e41318fcd5f5)
git cherry-pick -x $ancref..59539a3d3e7a5e263747bdf03ca8e41318fcd5f5

@ajs124 ajs124 mentioned this pull request Jan 27, 2022
13 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

10.rebuild-darwin: 1-10 This PR causes between 1 and 10 packages to rebuild on Darwin. 10.rebuild-linux: 11-100 This PR causes between 11 and 100 packages to rebuild on Linux.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants