From ae444ea4c4e12853e9791d6c567964e345fea922 Mon Sep 17 00:00:00 2001 From: John Ericson Date: Mon, 18 May 2015 04:21:50 +0000 Subject: agda: Remove `extraBuildFlags` This is unused, future users can just use override `buildFlags` and extend/replace as needed. `includeDirs` is provided for this purpose. We should add `dirOf self.everythingFile` rather than `.`, but `dirOf` breaks on relative paths so that is not an option. --- pkgs/build-support/agda/default.nix | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) (limited to 'pkgs/build-support/agda') diff --git a/pkgs/build-support/agda/default.nix b/pkgs/build-support/agda/default.nix index d268bc3b122a..a513d50d04c7 100644 --- a/pkgs/build-support/agda/default.nix +++ b/pkgs/build-support/agda/default.nix @@ -21,7 +21,6 @@ in sourceDirectories = filter (y: !(y == null)) x.sourceDirectories; propagatedBuildInputs = filter (y : ! (y == null)) x.propagatedBuildInputs; propagatedUserEnvPkgs = filter (y : ! (y == null)) x.propagatedUserEnvPkgs; - extraBuildFlags = filter (y : ! (y == null)) x.extraBuildFlags; everythingFile = if x.everythingFile == "" then "Everything.agda" else x.everythingFile; }; @@ -50,11 +49,11 @@ in # would make a direct copy of the whole thing. topSourceDirectories = [ "src" ]; - # Extra stuff to pass to the Agda binary. - extraBuildFlags = [ "-i ." ]; - buildFlags = let r = map (x: "-i " + x + "/share/agda") self.buildDepends; - d = map (x : "-i " + x) (self.sourceDirectories ++ self.topSourceDirectories); - in unwords (r ++ d ++ self.extraBuildFlags); + # FIXME: `dirOf self.everythingFile` is what we really want, not hardcoded "./" + includeDirs = let r = map (x: x + "/share/agda") self.buildDepends; + d = self.sourceDirectories ++ self.topSourceDirectories; + in r ++ d ++ [ "." ]; + buildFlags = unwords (map (x: "-i " + x) self.includeDirs); # We expose this as a mere convenience for any tools. AGDA_PACKAGE_PATH = concatMapStrings (x: x + ":") self.buildDepends; -- cgit 1.4.1