MirrorHub/nixpkgs
0
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-16 14:54:29 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

* Octave: use the generic builder. In particular the libraries are

Browse source 
now stripped which makes them much smaller.
* Octave: remove dependencies that are only necessary when building
  from CVS (bison, etc.).
* Octave: don't have a dependency on gcc, since that will cause
  *another* gcc to be build than the one in stdenv.

svn path=/nixpkgs/trunk/; revision=1262
This commit is contained in:
Eelco Dolstra 2004-08-11 20:08:34 +00:00
parent 2398d68d94
commit 4d7572e261
3 changed files with 7 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
pkgs/development/interpreters/octave/builder.sh
View file

@ -1,17 +0,0 @@
set -x
. $stdenv/setup
g77orig=$(cat $g77/nix-support/orig-gcc)
export NIX_LDFLAGS="-rpath $g77orig/lib $NIX_LDFLAGS"
export NIX_STRIP_DEBUG=
export NIX_CFLAGS_COMPILE="-g $NIX_CFLAGS_COMPILE"
tar xvfz $src
cd octave-*
./autogen.sh
./configure --prefix=$out --enable-readline
make
make install
#strip -S $out/lib/*/*.a

14
pkgs/development/interpreters/octave/default.nix
View file

@ -1,16 +1,14 @@
{ stdenv, fetchurl, autoconf, gcc, g77, texinfo, bison, flex, gperf, readline, ncurses}: {stdenv, fetchurl, g77, readline, ncurses}:
assert autoconf != null && texinfo != null assert readline != null && ncurses != null;
&& bison != null && flex != null && gperf != null && readline != null && ncurses != null ;
assert g77.langF77; assert g77.langF77;
stdenv.mkDerivation { stdenv.mkDerivation {
name = "octave-2.1.57"; name = "octave-2.1.57";
builder = ./builder.sh;
src = fetchurl { src = fetchurl {
url = ftp://ftp.octave.org/pub/octave/bleeding-edge/octave-2.1.57.tar.gz ; url = ftp://ftp.octave.org/pub/octave/octave-2.1.57.tar.bz2;
md5 = "a0171814e005ce6d77365e7d831eef45"; md5 = "b781f5d0cd750cb9bb3ef23523f5f339";
}; };
inherit autoconf gcc g77 texinfo bison flex gperf readline; buildInputs = [g77 readline ncurses];
buildInputs = [autoconf gcc g77 texinfo bison flex gperf readline ncurses] ; configureFlags = "--enable-readline";
} }

3
pkgs/system/all-packages-generic.nix
View file

@ -201,8 +201,7 @@ rec {
}; };
octave = (import ../development/interpreters/octave) { octave = (import ../development/interpreters/octave) {
inherit fetchurl stdenv autoconf gcc g77 texinfo flex gperf readline ncurses; inherit fetchurl stdenv readline ncurses g77;
bison = bisonnew;
}; };
gnumake = (import ../development/tools/build-managers/gnumake) { gnumake = (import ../development/tools/build-managers/gnumake) {