diff options
| author | Christophe Raffalli <raffalli@univ-savoie.fr> | 2013-06-08 09:25:34 +0200 |
|---|---|---|
| committer | Christophe Raffalli <raffalli@univ-savoie.fr> | 2013-06-08 09:25:34 +0200 |
| commit | d7223f3a3e9b06468be0d71d3dd1c2bc48fd196c (patch) | |
| tree | c23aa054079fa86c7d7632d9d7f5bc3800083476 /pkgs | |
| parent | 356983074eb4ad4711262a5b32091332ba2a1d51 (diff) | |
| download | nixlib-d7223f3a3e9b06468be0d71d3dd1c2bc48fd196c.tar nixlib-d7223f3a3e9b06468be0d71d3dd1c2bc48fd196c.tar.gz nixlib-d7223f3a3e9b06468be0d71d3dd1c2bc48fd196c.tar.bz2 nixlib-d7223f3a3e9b06468be0d71d3dd1c2bc48fd196c.tar.lz nixlib-d7223f3a3e9b06468be0d71d3dd1c2bc48fd196c.tar.xz nixlib-d7223f3a3e9b06468be0d71d3dd1c2bc48fd196c.tar.zst nixlib-d7223f3a3e9b06468be0d71d3dd1c2bc48fd196c.zip | |
simplify env-patoline and circumvert the bug with libgcc_s.so.1
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 38 |
1 files changed, 22 insertions, 16 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 067f074bdc0e..63b1e37fb959 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2786,22 +2786,6 @@ let 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 { gcc = gcc33; }; @@ -9448,6 +9432,28 @@ let 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 { }; zsnes = callPackage_i686 ../misc/emulators/zsnes { |