diff options
| author | Ryan Mulligan <ryan@ryantm.com> | 2018-05-28 05:59:57 -0700 |
|---|---|---|
| committer | Ryan Mulligan <ryan@ryantm.com> | 2018-05-28 05:59:57 -0700 |
| commit | af9d10a91b5ef0518ee12b220470735076974210 (patch) | |
| tree | ef7ede43a31b0b5998799f33dc8f0e8fdf254db3 /pkgs/tools/virtualization | |
| parent | f0d6411c22d91723fef3f935adf35c7884a4dc76 (diff) | |
| download | nixpkgs-af9d10a91b5ef0518ee12b220470735076974210.tar nixpkgs-af9d10a91b5ef0518ee12b220470735076974210.tar.gz nixpkgs-af9d10a91b5ef0518ee12b220470735076974210.tar.bz2 nixpkgs-af9d10a91b5ef0518ee12b220470735076974210.tar.lz nixpkgs-af9d10a91b5ef0518ee12b220470735076974210.tar.xz nixpkgs-af9d10a91b5ef0518ee12b220470735076974210.tar.zst nixpkgs-af9d10a91b5ef0518ee12b220470735076974210.zip | |
treewide: fix derivation names
Diffstat (limited to 'pkgs/tools/virtualization')
| -rw-r--r-- | pkgs/tools/virtualization/xe-guest-utilities/default.nix | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/pkgs/tools/virtualization/xe-guest-utilities/default.nix b/pkgs/tools/virtualization/xe-guest-utilities/default.nix index 9c783023d66..dfb1467b54d 100644 --- a/pkgs/tools/virtualization/xe-guest-utilities/default.nix +++ b/pkgs/tools/virtualization/xe-guest-utilities/default.nix @@ -1,7 +1,8 @@ { stdenv, fetchurl, bzip2, lzo, zlib, xz, bash, python, gnutar, gnused, gnugrep, which }: stdenv.mkDerivation (rec { - name = "xe-guest-utilities"; + pname = "xe-guest-utilities"; + name = "${pname}-${version}"; version = "6.2.0"; meta = { description = "Citrix XenServer Tools"; @@ -17,14 +18,14 @@ stdenv.mkDerivation (rec { buildInputs = [ bzip2 gnutar gnused python lzo zlib xz stdenv gnugrep which ]; patches = [ ./ip-address.patch ]; postPatch = '' - tar xf "$NIX_BUILD_TOP/$name-$version/xenstore-sources.tar.bz2" + tar xf "$NIX_BUILD_TOP/$name/xenstore-sources.tar.bz2" ''; buildPhase = '' export CC=gcc export CFLAGS='-Wall -Wstrict-prototypes -Wno-unused-local-typedefs -Wno-sizeof-pointer-memaccess' export PYTHON=python2 - cd "$NIX_BUILD_TOP/$name-$version/uclibc-sources" + cd "$NIX_BUILD_TOP/$name/uclibc-sources" for file in Config.mk tools/libxc/Makefile tools/misc/Makefile tools/misc/lomount/Makefile tools/xenstore/Makefile; do substituteInPlace "$file" --replace -Werror "" done @@ -39,12 +40,12 @@ stdenv.mkDerivation (rec { export LIBLEAFDIR_x86_64=lib fi for f in include libxc xenstore; do - [[ ! -d $NIX_BUILD_TOP/$name-$version/uclibc-sources/tools/$f ]] && continue - make -C "$NIX_BUILD_TOP/$name-$version/uclibc-sources/tools/$f" DESTDIR="$out" BINDIR=/bin SBINDIR=/bin INCLUDEDIR=/include LIBDIR=/lib install + [[ ! -d $NIX_BUILD_TOP/$name/uclibc-sources/tools/$f ]] && continue + make -C "$NIX_BUILD_TOP/$name/uclibc-sources/tools/$f" DESTDIR="$out" BINDIR=/bin SBINDIR=/bin INCLUDEDIR=/include LIBDIR=/lib install done rm -r "$out"/var - cd "$NIX_BUILD_TOP/$name-$version" + cd "$NIX_BUILD_TOP/$name" install -Dm755 xe-update-guest-attrs "$out/bin/xe-update-guest-attrs" install -Dm755 xe-daemon "$out/bin/xe-daemon" install -Dm644 xen-vcpu-hotplug.rules "$out/lib/udev/rules.d/10-xen-vcpu-hotplug.rules" |