diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2005-10-02 18:48:08 +0000 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2005-10-02 18:48:08 +0000 |
| commit | efdb847441313ad355e25058dc69ccc527f2ea33 (patch) | |
| tree | 64af765d9828c2e1f60b9369a970958817c0cb24 /pkgs/system/all-packages-generic.nix | |
| parent | e11a1e014c63fc3832432ddc1075e2446d5e45b0 (diff) | |
| download | nixpkgs-efdb847441313ad355e25058dc69ccc527f2ea33.tar nixpkgs-efdb847441313ad355e25058dc69ccc527f2ea33.tar.gz nixpkgs-efdb847441313ad355e25058dc69ccc527f2ea33.tar.bz2 nixpkgs-efdb847441313ad355e25058dc69ccc527f2ea33.tar.lz nixpkgs-efdb847441313ad355e25058dc69ccc527f2ea33.tar.xz nixpkgs-efdb847441313ad355e25058dc69ccc527f2ea33.tar.zst nixpkgs-efdb847441313ad355e25058dc69ccc527f2ea33.zip | |
* Use the new patchelf to build GHC in a fully pure way. Should be
checked on NixOS. svn path=/nixpkgs/trunk/; revision=3993
Diffstat (limited to 'pkgs/system/all-packages-generic.nix')
| -rw-r--r-- | pkgs/system/all-packages-generic.nix | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/pkgs/system/all-packages-generic.nix b/pkgs/system/all-packages-generic.nix index 65c5e538bb2..43ec4458de5 100644 --- a/pkgs/system/all-packages-generic.nix +++ b/pkgs/system/all-packages-generic.nix @@ -287,6 +287,10 @@ rec { inherit fetchurl stdenv; }; + patchelfNew = (import ../development/tools/misc/patchelf/new.nix) { + inherit fetchurl stdenv; + }; + gnum4 = (import ../development/tools/misc/gnum4) { inherit fetchurl stdenv; }; @@ -549,7 +553,9 @@ rec { #}; ghcboot = (import ../development/compilers/ghc/boot.nix) { - inherit fetchurl stdenv perl; + inherit fetchurl stdenv perl ncurses; + readline = readline4; + patchelf = patchelfNew; }; ghc = (import ../development/compilers/ghc) { @@ -1548,6 +1554,7 @@ rec { inherit (xlibs) libXt libXp libXext libX11; inherit (gtkLibs) glib pango atk gtk; libstdcpp5 = gcc33.gcc; +# patchelf = patchelfNew; }; eclipse = (import ../applications/editors/eclipse) { |