From e4a8b61eba6bd06c089f3f6a819f3f550aa2d148 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 10 Dec 2008 10:58:07 +0000 Subject: [PATCH] svn path=/nixpkgs/branches/stdenv-updates/; revision=13604 --- pkgs/build-support/release/default.nix | 3 +-- 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 e3ea97876f4..65813ef9cab 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 037a2ab66b0..43d4358d11c 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