b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

agda: Remove extraBuildFlags

Browse source 
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.
This commit is contained in:
John Ericson 2015-05-18 04:21:50 +00:00
parent 95c1c686a3
commit ae444ea4c4
1 changed files with 5 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
pkgs/build-support/agda/default.nix
View file

@ -21,7 +21,6 @@ in
sourceDirectories = filter (y: !(y == null)) x.sourceDirectories; sourceDirectories = filter (y: !(y == null)) x.sourceDirectories;
propagatedBuildInputs = filter (y : ! (y == null)) x.propagatedBuildInputs; propagatedBuildInputs = filter (y : ! (y == null)) x.propagatedBuildInputs;
propagatedUserEnvPkgs = filter (y : ! (y == null)) x.propagatedUserEnvPkgs; propagatedUserEnvPkgs = filter (y : ! (y == null)) x.propagatedUserEnvPkgs;
extraBuildFlags = filter (y : ! (y == null)) x.extraBuildFlags;
everythingFile = if x.everythingFile == "" then "Everything.agda" else x.everythingFile; everythingFile = if x.everythingFile == "" then "Everything.agda" else x.everythingFile;
}; };
@ -50,11 +49,11 @@ in
# would make a direct copy of the whole thing. # would make a direct copy of the whole thing.
topSourceDirectories = [ "src" ]; topSourceDirectories = [ "src" ];
# Extra stuff to pass to the Agda binary. # FIXME: `dirOf self.everythingFile` is what we really want, not hardcoded "./"
extraBuildFlags = [ "-i ." ]; includeDirs = let r = map (x: x + "/share/agda") self.buildDepends;
buildFlags = let r = map (x: "-i " + x + "/share/agda") self.buildDepends; d = self.sourceDirectories ++ self.topSourceDirectories;
d = map (x : "-i " + x) (self.sourceDirectories ++ self.topSourceDirectories); in r ++ d ++ [ "." ];
in unwords (r ++ d ++ self.extraBuildFlags); buildFlags = unwords (map (x: "-i " + x) self.includeDirs);
# We expose this as a mere convenience for any tools. # We expose this as a mere convenience for any tools.
AGDA_PACKAGE_PATH = concatMapStrings (x: x + ":") self.buildDepends; AGDA_PACKAGE_PATH = concatMapStrings (x: x + ":") self.buildDepends;