public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

simplify env-patoline and circumvert the bug with libgcc_s.so.1

Browse Source
This commit is contained in:
Christophe Raffalli 2013-06-08 09:25:34 +02:00
parent 356983074e
commit d7223f3a3e
1 changed files with 22 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
pkgs/top-level/all-packages.nix
View File

@ -2786,22 +2786,6 @@ let
ocamlnat = let callPackage = newScope pkgs.ocamlPackages_3_12_1; in callPackage ../development/ocaml-modules/ocamlnat { }; ocamlnat = let callPackage = newScope pkgs.ocamlPackages_3_12_1; in callPackage ../development/ocaml-modules/ocamlnat { };
# patoline requires a rather large ocaml compilation environment.
# this is why it is build as an environment and not just a normal package.
# remark : the emacs mode is also installed, but you have to adjust your load-path.
mkPatolineEnv = pack: pkgs.myEnvFun {
name = "patoline";
buildInputs = [ stdenv ncurses mesa freeglut libzip
pack.ocaml pack.findlib pack.camomile
pack.dypgen pack.ocaml_sqlite3 pack.camlzip
pack.lablgtk pack.camlimages pack.ocaml_cairo
pack.lablgl pack.ocamlnet pack.cryptokit
pack.ocaml_pcre pack.patoline
];
};
patoline = mkPatolineEnv ocamlPackages_4_00_1;
opencxx = callPackage ../development/compilers/opencxx { opencxx = callPackage ../development/compilers/opencxx {
gcc = gcc33; gcc = gcc33;
}; };
@ -9448,6 +9432,28 @@ let
inherit (stdenv) mkDerivation; inherit (stdenv) mkDerivation;
}; };
# patoline requires a rather large ocaml compilation environment.
# this is why it is build as an environment and not just a normal package.
# remark : the emacs mode is also installed, but you have to adjust your load-path.
PatolineEnv = pack: myEnvFun {
name = "patoline";
buildInputs = [ stdenv ncurses mesa freeglut libzip gcc
pack.ocaml pack.findlib pack.camomile
pack.dypgen pack.ocaml_sqlite3 pack.camlzip
pack.lablgtk pack.camlimages pack.ocaml_cairo
pack.lablgl pack.ocamlnet pack.cryptokit
pack.ocaml_pcre pack.patoline
];
# this is to circumvent the bug with libgcc_s.so.1 which is
# not found when using thread
extraCmds = ''
LD_LIBRARY_PATH=\$LD_LIBRARY_PATH:${gcc.gcc}/lib
export LD_LIBRARY_PATH
'';
};
patoline = PatolineEnv ocamlPackages_4_00_1;
znc = callPackage ../applications/networking/znc { }; znc = callPackage ../applications/networking/znc { };
zsnes = callPackage_i686 ../misc/emulators/zsnes { zsnes = callPackage_i686 ../misc/emulators/zsnes {