diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2018-08-17 13:44:40 +0200 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2018-08-17 13:45:21 +0200 |
| commit | cbabebcc2e3b884296fedf8591e04f59240b3939 (patch) | |
| tree | 54f637fbb59548753ac613ec3e4f56aae97a5e6e /pkgs/applications/virtualization/qemu/default.nix | |
| parent | 7a22083e1271869294a074cbe7a971f2d8abb4f4 (diff) | |
| parent | 93147d737d24f55d8da7257e24d840c9f9b1fe6c (diff) | |
| download | nixlib-cbabebcc2e3b884296fedf8591e04f59240b3939.tar nixlib-cbabebcc2e3b884296fedf8591e04f59240b3939.tar.gz nixlib-cbabebcc2e3b884296fedf8591e04f59240b3939.tar.bz2 nixlib-cbabebcc2e3b884296fedf8591e04f59240b3939.tar.lz nixlib-cbabebcc2e3b884296fedf8591e04f59240b3939.tar.xz nixlib-cbabebcc2e3b884296fedf8591e04f59240b3939.tar.zst nixlib-cbabebcc2e3b884296fedf8591e04f59240b3939.zip | |
Merge branch 'master' into staging-next
Hydra: ?compare=1473892
Diffstat (limited to 'pkgs/applications/virtualization/qemu/default.nix')
| -rw-r--r-- | pkgs/applications/virtualization/qemu/default.nix | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/pkgs/applications/virtualization/qemu/default.nix b/pkgs/applications/virtualization/qemu/default.nix index 742c2fb03f7c..1ff61129b0f9 100644 --- a/pkgs/applications/virtualization/qemu/default.nix +++ b/pkgs/applications/virtualization/qemu/default.nix @@ -22,8 +22,8 @@ with stdenv.lib; let - version = "2.12.0"; - sha256 = "17377xxbmwbrnh895a108z944pqi39hzrbw4jzgj8pcipi3s3x69"; + version = "2.12.1"; + sha256 = "1jp5y56682bgpfjapagxjfrjdvqkal34pj9qzn6kj8fqaad80l21"; audio = optionalString (hasSuffix "linux" stdenv.system) "alsa," + optionalString pulseSupport "pa," + optionalString sdlSupport "sdl,"; @@ -71,8 +71,10 @@ stdenv.mkDerivation rec { outputs = [ "out" "ga" ]; - patches = [ ./no-etc-install.patch ] - ++ optional nixosTestRunner ./force-uid0-on-9p.patch + patches = [ + ./no-etc-install.patch + ./fix-qemu-ga.patch + ] ++ optional nixosTestRunner ./force-uid0-on-9p.patch ++ optional pulseSupport ./fix-hda-recording.patch ++ optionals stdenv.hostPlatform.isMusl [ (fetchpatch { |