From e9d435a195ea554519b78c3d76972d9e8e52c443 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 6 Apr 2011 15:08:36 +0000 Subject: [PATCH] svn path=/nixpkgs/trunk/; revision=26720 --- pkgs/applications/virtualization/nova/default.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/virtualization/nova/default.nix b/pkgs/applications/virtualization/nova/default.nix index e28f9012fc6..55dc16d4d3c 100644 --- a/pkgs/applications/virtualization/nova/default.nix +++ b/pkgs/applications/virtualization/nova/default.nix @@ -52,11 +52,13 @@ stdenv.mkDerivation rec { python setup.py install --prefix=$out # Nova doesn't like to be called ".nova-foo-wrapped" because it - # computes some stuff from its own argv[0]. So call the wrapped - # programs ".nova-foo" by overriding wrapProgram. + # computes some stuff from its own argv[0]. So put the wrapped + # programs in $out/libexec under their original names. + mkdir -p $out/libexec/nova + wrapProgram() { local prog="$1" - local hidden="$(dirname "$prog")/.$(basename "$prog")" + local hidden=$out/libexec/nova/$(basename "$prog") mv $prog $hidden makeWrapper $hidden $prog "$@" }