diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2008-12-10 10:58:07 +0000 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2008-12-10 10:58:07 +0000 |
| commit | e4a8b61eba6bd06c089f3f6a819f3f550aa2d148 (patch) | |
| tree | 1cea885eb7943d6aeb676ec4b55507b4214f9957 | |
| parent | 0adab29d1ea4a717a461e2f9ab8d77e09c876778 (diff) | |
| download | nixlib-e4a8b61eba6bd06c089f3f6a819f3f550aa2d148.tar nixlib-e4a8b61eba6bd06c089f3f6a819f3f550aa2d148.tar.gz nixlib-e4a8b61eba6bd06c089f3f6a819f3f550aa2d148.tar.bz2 nixlib-e4a8b61eba6bd06c089f3f6a819f3f550aa2d148.tar.lz nixlib-e4a8b61eba6bd06c089f3f6a819f3f550aa2d148.tar.xz nixlib-e4a8b61eba6bd06c089f3f6a819f3f550aa2d148.tar.zst nixlib-e4a8b61eba6bd06c089f3f6a819f3f550aa2d148.zip | |
svn path=/nixpkgs/branches/stdenv-updates/; revision=13604
| -rw-r--r-- | pkgs/build-support/release/default.nix | 3 | ||||
| -rw-r--r-- | pkgs/development/interpreters/octave/hg.nix | 2 |
2 files changed, 2 insertions, 3 deletions
diff --git a/pkgs/build-support/release/default.nix b/pkgs/build-support/release/default.nix index e3ea97876f46..65813ef9cabb 100644 --- a/pkgs/build-support/release/default.nix +++ b/pkgs/build-support/release/default.nix @@ -5,8 +5,7 @@ with pkgs; rec { makeSourceTarball = args: import ./make-source-tarball.nix ( - { inherit autoconf automake libtool; - stdenv = stdenvNew; + { inherit stdenv autoconf automake libtool; } // args); nixBuild = args: import ./nix-build.nix ( diff --git a/pkgs/development/interpreters/octave/hg.nix b/pkgs/development/interpreters/octave/hg.nix index 037a2ab66b01..43d4358d11c0 100644 --- a/pkgs/development/interpreters/octave/hg.nix +++ b/pkgs/development/interpreters/octave/hg.nix @@ -2,7 +2,7 @@ bison, autoconf, automake, sourceByName, getConfig, lib, atlas, gperf, python, glibc, gnuplot, texinfo, texLive}: assert readline != null && ncurses != null && flex != null; -assert g77.langF77; +assert g77.langFortran; let commonBuildInputs = [g77 readline ncurses perl glibc]; in |