diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2009-04-09 15:24:33 +0000 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2009-04-09 15:24:33 +0000 |
| commit | eeed10ba8e1fd93e23c4c8ef4a296bbdc6df557a (patch) | |
| tree | 54d4bba82530f4b74578ffcc54420a22890d0f61 /pkgs/development/interpreters/octave | |
| parent | 65a6c5ad9b83f83bb42474c77b32f83830949a09 (diff) | |
| download | nixlib-eeed10ba8e1fd93e23c4c8ef4a296bbdc6df557a.tar nixlib-eeed10ba8e1fd93e23c4c8ef4a296bbdc6df557a.tar.gz nixlib-eeed10ba8e1fd93e23c4c8ef4a296bbdc6df557a.tar.bz2 nixlib-eeed10ba8e1fd93e23c4c8ef4a296bbdc6df557a.tar.lz nixlib-eeed10ba8e1fd93e23c4c8ef4a296bbdc6df557a.tar.xz nixlib-eeed10ba8e1fd93e23c4c8ef4a296bbdc6df557a.tar.zst nixlib-eeed10ba8e1fd93e23c4c8ef4a296bbdc6df557a.zip | |
* g77 -> gfortran throughout. Got rid of the separate
expressions/builders for Fortran. Tested by building Octave with gfortran 4.3. svn path=/nixpkgs/branches/stdenv-updates/; revision=14978
Diffstat (limited to 'pkgs/development/interpreters/octave')
| -rw-r--r-- | pkgs/development/interpreters/octave/hg.nix | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/pkgs/development/interpreters/octave/hg.nix b/pkgs/development/interpreters/octave/hg.nix index 9e7d1d465496..4d31cc84efcd 100644 --- a/pkgs/development/interpreters/octave/hg.nix +++ b/pkgs/development/interpreters/octave/hg.nix @@ -1,10 +1,7 @@ -{stdenv, fetchurl, g77, readline, ncurses, perl, flex, +{stdenv, fetchurl, gfortran, readline, ncurses, perl, flex, bison, autoconf, automake, sourceByName, getConfig, lib, atlas, gperf, python, glibc, gnuplot, texinfo, texLive, qhull, libX11}: -assert readline != null && ncurses != null && flex != null; -assert g77.langFortran; - -let commonBuildInputs = [g77 readline ncurses perl glibc qhull libX11 texinfo]; in +let commonBuildInputs = [gfortran readline ncurses perl glibc qhull libX11 texinfo]; in stdenv.mkDerivation ({ NIX_LDFLAGS = "-lpthread"; |