diff options
| author | Lluís Batlle i Rossell <viric@vicerveza.homeunix.net> | 2009-11-19 19:09:10 +0000 |
|---|---|---|
| committer | Lluís Batlle i Rossell <viric@vicerveza.homeunix.net> | 2009-11-19 19:09:10 +0000 |
| commit | e85500987b7df503b37a127a5ea49a07f92e70f0 (patch) | |
| tree | 5f66b5de9aadaf0ff3ba52c394dc0066114e11e2 /pkgs/applications/virtualization/qemu/linux-img/0.2.nix | |
| parent | 7ade207f6b75da0fde94cec621ac6d8fa6c3e586 (diff) | |
| parent | 58f543f19f1a2eed8a46202b36a855836cfc9e0f (diff) | |
| download | nixlib-e85500987b7df503b37a127a5ea49a07f92e70f0.tar nixlib-e85500987b7df503b37a127a5ea49a07f92e70f0.tar.gz nixlib-e85500987b7df503b37a127a5ea49a07f92e70f0.tar.bz2 nixlib-e85500987b7df503b37a127a5ea49a07f92e70f0.tar.lz nixlib-e85500987b7df503b37a127a5ea49a07f92e70f0.tar.xz nixlib-e85500987b7df503b37a127a5ea49a07f92e70f0.tar.zst nixlib-e85500987b7df503b37a127a5ea49a07f92e70f0.zip | |
Merging from trunk. I had to do two manual merges, quite trivial I think.
svn path=/nixpkgs/branches/stdenv-updates/; revision=18472
Diffstat (limited to 'pkgs/applications/virtualization/qemu/linux-img/0.2.nix')
| -rw-r--r-- | pkgs/applications/virtualization/qemu/linux-img/0.2.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/applications/virtualization/qemu/linux-img/0.2.nix b/pkgs/applications/virtualization/qemu/linux-img/0.2.nix index 0d5e94ded959..748f67c7448e 100644 --- a/pkgs/applications/virtualization/qemu/linux-img/0.2.nix +++ b/pkgs/applications/virtualization/qemu/linux-img/0.2.nix @@ -13,11 +13,11 @@ args : with args; let doCopy = fullDepEntry (" ensureDir \$out/share/qemu-images - cp linux-${version}.img \$out/share/qemu-images/ + cp linux-0.2.img \$out/share/qemu-images/ ") [minInit doUnpack defEnsureDir]; in stdenv.mkDerivation rec { - name = "QEmu-Linux-Image-"+version; + name = "QEmu-Linux-Image-0.2"; builder = writeScript (name + "-builder") (textClosure localDefs [doCopy doForceShare doPropagate]); meta = { |