diff options
author | Tom Ridge <tom.j.ridge@googlemail.com> | 2013-11-16 02:52:36 +0200 |
---|---|---|
committer | Evgeny Egorochkin <phreedom@yandex.ru> | 2013-11-16 02:52:36 +0200 |
commit | f13bcf6463b98d79a6d419850facc3c9187424a1 (patch) | |
tree | f5184faba8951db54f95c2860a5bef7a26f99052 /pkgs | |
parent | d4b3a7d68571a347719c9c9423833ea1fedbc418 (diff) |
HOL: update to k.8
Diffstat (limited to 'pkgs')
-rw-r--r-- | pkgs/applications/science/logic/hol/default.nix | 23 |
1 files changed, 5 insertions, 18 deletions
diff --git a/pkgs/applications/science/logic/hol/default.nix b/pkgs/applications/science/logic/hol/default.nix index 2e1647b6c71d9..52a3129fec0ae 100644 --- a/pkgs/applications/science/logic/hol/default.nix +++ b/pkgs/applications/science/logic/hol/default.nix @@ -1,5 +1,4 @@ -{stdenv, fetchurl, polyml, graphviz, fontconfig, liberation_ttf, - experimentalKernel ? true}: +{stdenv, fetchurl, polyml, graphviz, experimentalKernel ? true}: let pname = "hol4"; @@ -16,18 +15,9 @@ stdenv.mkDerivation { sha256 = "5ce4c1e37301dbc38772694e98f1c7eabf69255908de204b280d8b2b1709e9d0"; }; - buildInputs = [polyml graphviz fontconfig liberation_ttf]; + buildInputs = [polyml graphviz]; buildCommand = '' - - mkdir chroot-fontconfig - cat ${fontconfig}/etc/fonts/fonts.conf > chroot-fontconfig/fonts.conf - sed -e 's@</fontconfig>@@' -i chroot-fontconfig/fonts.conf - echo "<dir>${liberation_ttf}</dir>" >> chroot-fontconfig/fonts.conf - echo "</fontconfig>" >> chroot-fontconfig/fonts.conf - - export FONTCONFIG_FILE=$(pwd)/chroot-fontconfig/fonts.conf - mkdir -p "$out/src" cd "$out/src" @@ -38,19 +28,16 @@ stdenv.mkDerivation { --replace "\"/bin/mv\"" "\"mv\"" \ --replace "\"/bin/cp\"" "\"cp\"" - for f in tools/buildutils.sml help/src-sml/DOT; - do - substituteInPlace $f --replace "\"/usr/bin/dot\"" "\"${graphviz}/bin/dot\"" - done + substituteInPlace tools/buildutils.sml --replace "\"/usr/bin/dot\"" "\"dot\"" #sed -ie "/compute/,999 d" tools/build-sequence # for testing poly < tools/smart-configure.sml - + bin/build ${kernelFlag} -symlink mkdir -p "$out/bin" - ln -st $out/bin "$out/src/${holsubdir}/bin/"* + ln -st $out/bin $out/src/${holsubdir}/bin/* # ln -s $out/src/hol4.${version}/bin $out/bin ''; |