diff --git a/pkgs/development/coq-modules/containers/default.nix b/pkgs/development/coq-modules/containers/default.nix index 92ac9d16cf6..5c5681f6010 100644 --- a/pkgs/development/coq-modules/containers/default.nix +++ b/pkgs/development/coq-modules/containers/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { homepage = http://coq.inria.fr/pylons/pylons/contribs/view/Containers/v8.4; description = "A typeclass-based Coq library of finite sets/maps"; - maintainers = with maintainers; [ vbgl ]; + maintainers = with maintainers; [ vbgl jwiegley ]; platforms = coq.meta.platforms; }; diff --git a/pkgs/development/coq-modules/coq-ext-lib/default.nix b/pkgs/development/coq-modules/coq-ext-lib/default.nix index 44173843033..b9939a2e7f4 100644 --- a/pkgs/development/coq-modules/coq-ext-lib/default.nix +++ b/pkgs/development/coq-modules/coq-ext-lib/default.nix @@ -14,7 +14,9 @@ stdenv.mkDerivation rec { buildInputs = [ coq.ocaml coq.camlp5 ]; propagatedBuildInputs = [ coq ]; - installFlags = "COQLIB=$(out)/lib/coq/${coq.coq-version}"; + enableParallelBuilding = true; + + installFlags = "COQLIB=$(out)/lib/coq/${coq.coq-version}/"; meta = with stdenv.lib; { homepage = https://github.com/coq-ext-lib/coq-ext-lib; diff --git a/pkgs/development/coq-modules/mathcomp/default.nix b/pkgs/development/coq-modules/mathcomp/default.nix index ca8bd6481ef..02d06edd538 100644 --- a/pkgs/development/coq-modules/mathcomp/default.nix +++ b/pkgs/development/coq-modules/mathcomp/default.nix @@ -11,12 +11,14 @@ stdenv.mkDerivation { propagatedBuildInputs = [ coq ssreflect ]; + enableParallelBuilding = true; + installFlags = "COQLIB=$(out)/lib/coq/${coq.coq-version}/"; meta = with stdenv.lib; { homepage = http://ssr.msr-inria.inria.fr/; license = licenses.cecill-b; - maintainers = [ maintainers.vbgl ]; + maintainers = [ maintainers.vbgl maintainers.jwiegley ]; platforms = coq.meta.platforms; hydraPlatforms = []; }; diff --git a/pkgs/development/coq-modules/ssreflect/default.nix b/pkgs/development/coq-modules/ssreflect/default.nix index 912ff7071f8..75112ec9663 100644 --- a/pkgs/development/coq-modules/ssreflect/default.nix +++ b/pkgs/development/coq-modules/ssreflect/default.nix @@ -14,12 +14,26 @@ stdenv.mkDerivation { buildInputs = [ coq.ocaml coq.camlp5 ]; propagatedBuildInputs = [ coq ]; + enableParallelBuilding = true; + + patchPhase = '' + # Permit building of the ssrcoq statically-bound executable + sed -i 's/^#-custom/-custom/' Make + sed -i 's/^#SSRCOQ/SSRCOQ/' Make + ''; + installFlags = "COQLIB=$(out)/lib/coq/${coq.coq-version}/"; + postInstall = '' + mkdir -p $out/bin + cp -p bin/ssrcoq $out/bin + cp -p bin/ssrcoq.byte $out/bin + ''; + meta = with stdenv.lib; { homepage = http://ssr.msr-inria.inria.fr/; license = licenses.cecill-b; - maintainers = with maintainers; [ vbgl ]; + maintainers = with maintainers; [ vbgl jwiegley ]; platforms = coq.meta.platforms; };