diff options
author | Ludovic Courtès <ludo@gnu.org> | 2011-11-30 14:25:59 +0000 |
---|---|---|
committer | Ludovic Courtès <ludo@gnu.org> | 2011-11-30 14:25:59 +0000 |
commit | 80067c9a0ff2fd321449c045d8ffa321c9332cd3 (patch) | |
tree | 57a59c5fd1d080839ec029038457ff497c1479b7 /pkgs/development/libraries/cloog | |
parent | a90a55309f50a163be0e98d8c184b2a62e7231c7 (diff) |
CLooG 0.16.3, along with simplifications.
svn path=/nixpkgs/trunk/; revision=30635
Diffstat (limited to 'pkgs/development/libraries/cloog')
-rw-r--r-- | pkgs/development/libraries/cloog/default.nix | 20 |
1 files changed, 6 insertions, 14 deletions
diff --git a/pkgs/development/libraries/cloog/default.nix b/pkgs/development/libraries/cloog/default.nix index 93af6d18b144f..7bd0d68c3ec2e 100644 --- a/pkgs/development/libraries/cloog/default.nix +++ b/pkgs/development/libraries/cloog/default.nix @@ -1,31 +1,23 @@ { fetchurl, stdenv, gmp, isl, static ? false }: -let - staticFlags = - assert static -> isl.dontDisableStatic == true; - if static then "--enable-static --disable-shared" else ""; - -in +assert static -> isl.dontDisableStatic; stdenv.mkDerivation rec { - name = "cloog-0.16.2"; + name = "cloog-0.16.3"; src = fetchurl { url = "http://www.bastoul.net/cloog/pages/download/count.php3?url=./${name}.tar.gz"; - sha256 = "1w9n9lsq18k65fywwbbvhkgl917053w1kvqw0xhlwcma0v59m6mx"; + sha256 = "0lzbsszfzsr0jfwkccfbsvx913d2yc45dqwa472plmxkhbwykmc9"; }; buildInputs = [ gmp ]; propagatedBuildInputs = [ isl ]; - configureFlags = "--with-isl=system --with-isl-prefix=${isl}" + staticFlags; - - dontDisableStatic = if static then true else false; + configureFlags = [ "--with-isl=system" ] + ++ (stdenv.lib.optionals static [ "--enable-static" "--disable-shared" ]); - crossAttrs = { - configureFlags = "--with-isl=system --with-isl-prefix=${isl.hostDrv}" + staticFlags; - }; + dontDisableStatic = static; doCheck = true; |