From edefde9b2fa88409f0e3be243763ab10bee4611c Mon Sep 17 00:00:00 2001
From: Mart Kolthof <skolthof@cs.uu.nl>
Date: Thu, 24 Aug 2006 14:19:59 +0000
Subject: [PATCH] * trying to keep to the standards

svn path=/nixpkgs/trunk/; revision=6226
---
 pkgs/development/libraries/cil-aterm/default.nix | 6 +++---
 pkgs/top-level/all-packages.nix                  | 3 ++-
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/libraries/cil-aterm/default.nix b/pkgs/development/libraries/cil-aterm/default.nix
index d1dfd3c55882..53e007dc6ea8 100644
--- a/pkgs/development/libraries/cil-aterm/default.nix
+++ b/pkgs/development/libraries/cil-aterm/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, ocaml3080, perl }:
+{ stdenv, fetchurl, ocaml, perl }:
 
 stdenv.mkDerivation {
   name    = "cil-aterm-1.3.4";
@@ -7,6 +7,6 @@ stdenv.mkDerivation {
                 md5 = "a7fa54f19844a20562efd37f67c391da";
             };
   patches = [./cil-aterm-1.3.4.patch];
-  buildInputs = [ ocaml3080 perl ];
-  inherit ocaml3080 perl;
+  buildInputs = [ ocaml perl ];
+  inherit ocaml perl;
 }  
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index f722b50ec2d4..6a26c4e897cb 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1043,7 +1043,8 @@ rec {
   };
 
   cilaterm = (import ../development/libraries/cil-aterm) {
-    inherit stdenv fetchurl ocaml3080 perl;
+    ocaml = ocaml3080;
+    inherit stdenv fetchurl perl;
   };
 
   pcre = (import ../development/libraries/pcre) {