MirrorHub/nixpkgs
0
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-16 23:03:40 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Merge pull request #58471 from colemickens/cu

Browse source 
cloud-utils: use `qemu-utils` instead of `qemu`
This commit is contained in:
Joachim F 2019-10-02 09:59:52 +00:00 committed by GitHub
commit 2c117aec37
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 20 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
pkgs/applications/virtualization/qemu/utils.nix Normal file
View file

@ -0,0 +1,16 @@
{ stdenv, qemu }:
stdenv.mkDerivation rec {
name = "qemu-utils-${version}";
version = qemu.version;
buildInputs = [ qemu ];
unpackPhase = "true";
installPhase = ''
mkdir -p "$out/bin"
cp "${qemu}/bin/qemu-img" "$out/bin/qemu-img"
cp "${qemu}/bin/qemu-io" "$out/bin/qemu-io"
cp "${qemu}/bin/qemu-nbd" "$out/bin/qemu-nbd"
'';
}

4
pkgs/tools/misc/cloud-utils/default.nix
View file

@ -1,6 +1,6 @@
{ stdenv, fetchurl, makeWrapper
, gawk, gnused, utillinux, file
, wget, python3, qemu, euca2ools
, wget, python3, qemu-utils, euca2ools
, e2fsprogs, cdrkit }:
stdenv.mkDerivation rec {
@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
# according to https://packages.ubuntu.com/source/zesty/cloud-utils
binDeps = [
wget e2fsprogs file gnused gawk utillinux qemu euca2ools cdrkit
wget e2fsprogs file gnused gawk utillinux qemu-utils euca2ools cdrkit
];
postFixup = ''

2
pkgs/top-level/all-packages.nix
View file

@ -20218,6 +20218,8 @@ in
python = python3;
};
qemu-utils = callPackage ../applications/virtualization/qemu/utils.nix {};
qgis-unwrapped = libsForQt5.callPackage ../applications/gis/qgis/unwrapped.nix {
withGrass = false;
};