mirror of
https://github.com/NixOS/nixpkgs.git
synced 2026-07-06 17:13:24 -05:00
qemu: move to pkgs/by-name (#456129)
This commit is contained in:
commit
a1db1ee6d5
9 changed files with 3 additions and 9 deletions
|
|
@ -23,7 +23,6 @@
|
|||
ninja,
|
||||
meson,
|
||||
perl,
|
||||
sigtool,
|
||||
makeWrapper,
|
||||
removeReferencesTo,
|
||||
attr,
|
||||
|
|
@ -32,6 +31,7 @@
|
|||
socat,
|
||||
libslirp,
|
||||
libcbor,
|
||||
darwin,
|
||||
guestAgentSupport ?
|
||||
(with stdenv.hostPlatform; isLinux || isNetBSD || isOpenBSD || isSunOS || isWindows) && !minimal,
|
||||
numaSupport ? stdenv.hostPlatform.isLinux && !stdenv.hostPlatform.isAarch32 && !minimal,
|
||||
|
|
@ -174,7 +174,7 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
]
|
||||
++ lib.optionals hexagonSupport [ glib ]
|
||||
++ lib.optionals stdenv.hostPlatform.isDarwin [
|
||||
sigtool
|
||||
darwin.sigtool
|
||||
]
|
||||
++ lib.optionals (!userOnly) [ dtc ];
|
||||
|
||||
|
|
@ -10322,10 +10322,6 @@ with pkgs;
|
|||
|
||||
eiskaltdcpp = libsForQt5.callPackage ../applications/networking/p2p/eiskaltdcpp { };
|
||||
|
||||
qemu = callPackage ../applications/virtualization/qemu {
|
||||
inherit (darwin) sigtool;
|
||||
};
|
||||
|
||||
qemu-python-utils = python3Packages.toPythonApplication (
|
||||
python3Packages.qemu.override {
|
||||
fuseSupport = true;
|
||||
|
|
@ -10342,9 +10338,7 @@ with pkgs;
|
|||
userOnly = true;
|
||||
};
|
||||
|
||||
canokey-qemu = callPackage ../applications/virtualization/qemu/canokey-qemu.nix { };
|
||||
|
||||
wrapQemuBinfmtP = callPackage ../applications/virtualization/qemu/binfmt-p-wrapper.nix { };
|
||||
wrapQemuBinfmtP = callPackage ../by-name/qe/qemu/binfmt-p-wrapper.nix { };
|
||||
|
||||
qmediathekview = libsForQt5.callPackage ../applications/video/qmediathekview { };
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue