diff options
| author | Michael Raskin <7c6f434c@mail.ru> | 2013-11-28 02:57:59 -0800 |
|---|---|---|
| committer | Michael Raskin <7c6f434c@mail.ru> | 2013-11-28 02:57:59 -0800 |
| commit | 64e380c85355c170194a00b2f2b60f0d678871a7 (patch) | |
| tree | 4a7455b2b83031df0f09537ef6b9b325aea0dec4 /pkgs/top-level | |
| parent | e17df71e2b0099c821e0fba293202c8869778867 (diff) | |
| parent | 81d7906e1908c2cc6302432cb1d591a0877430cc (diff) | |
| download | nixpkgs-64e380c85355c170194a00b2f2b60f0d678871a7.tar nixpkgs-64e380c85355c170194a00b2f2b60f0d678871a7.tar.gz nixpkgs-64e380c85355c170194a00b2f2b60f0d678871a7.tar.bz2 nixpkgs-64e380c85355c170194a00b2f2b60f0d678871a7.tar.lz nixpkgs-64e380c85355c170194a00b2f2b60f0d678871a7.tar.xz nixpkgs-64e380c85355c170194a00b2f2b60f0d678871a7.tar.zst nixpkgs-64e380c85355c170194a00b2f2b60f0d678871a7.zip | |
Merge pull request #1266 from AndersonTorres/master
Merge request: A Nix expression for Bochs
Diffstat (limited to 'pkgs/top-level')
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 55d82790b8c..e13d73060c5 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -533,6 +533,8 @@ let bmon = callPackage ../tools/misc/bmon { }; + bochs = callPackage ../applications/virtualization/bochs { }; + boomerang = callPackage ../development/tools/boomerang { stdenv = overrideGCC stdenv gcc47; }; |