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

qemu: Add patch to fix incorrect permissions on samba >= 2.0.5 #145573

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions pkgs/applications/virtualization/qemu/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,14 @@ stdenv.mkDerivation rec {
patches = [
./fix-qemu-ga.patch
./9p-ignore-noatime.patch
# Fix qemu writing `smb.conf` incorrectly, breaking
# `-net user,smb=/dir` mounts on samba >= 2.0.5.
# Remove when https://lists.gnu.org/archive/html/qemu-devel/2021-02/msg07156.html is merged and available
(fetchpatch {
name = "net-slirp-Fix-incorrect-permissions-on-samba-2.0.5.patch";
url = "https://github.com/nh2/qemu/commit/de30898a738bd073593d20930496ef63e54d62a3.patch";
Copy link
Member

Choose a reason for hiding this comment

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

Suggested change
url = "https://github.com/nh2/qemu/commit/de30898a738bd073593d20930496ef63e54d62a3.patch";
url = "https://github.com/qemu/qemu/commit/de30898a738bd073593d20930496ef63e54d62a3.patch";

makes it easier to track when it is merged.

sha256 = "14jwfip0l6y0i1sr14avn2di9w4748kla679p4qhb7xxvifgqdcj";
})
# Cocoa clipboard support only works on macOS 10.14+
(fetchpatch {
url = "https://gitlab.com/qemu-project/qemu/-/commit/7e3e20d89129614f4a7b2451fe321cc6ccca3b76.diff";
Expand Down