mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-09-11 15:08:33 +01:00
ocamlPackages.javalib: switch to fetchFromGitHub
This commit is contained in:
parent
fd5bbfd0b7
commit
708fff241a
|
@ -1,5 +1,11 @@
|
|||
{ lib, stdenv, fetchzip, which, ocaml, findlib
|
||||
, camlzip, extlib
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, which
|
||||
, ocaml
|
||||
, findlib
|
||||
, camlzip
|
||||
, extlib
|
||||
}:
|
||||
|
||||
if !lib.versionAtLeast ocaml.version "4.04"
|
||||
|
@ -7,12 +13,14 @@ then throw "javalib is not available for OCaml ${ocaml.version}"
|
|||
else
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "ocaml${ocaml.version}-javalib-${version}";
|
||||
pname = "ocaml${ocaml.version}-javalib";
|
||||
version = "3.2.1";
|
||||
|
||||
src = fetchzip {
|
||||
url = "https://github.com/javalib-team/javalib/archive/v${version}.tar.gz";
|
||||
sha256 = "1fkdaiiza145yv0r1cm0n2hsrr0rbn6b27vs66njgv405zwn3vbn";
|
||||
src = fetchFromGitHub {
|
||||
owner = "javalib-team";
|
||||
repo = "javalib";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-du1h+S+A7CetMXofsYxdGeSsobCgspDB9oUE9WNUbbo=";
|
||||
};
|
||||
|
||||
buildInputs = [ which ocaml findlib ];
|
||||
|
@ -26,7 +34,7 @@ stdenv.mkDerivation rec {
|
|||
configureScript = "./configure.sh";
|
||||
dontAddPrefix = "true";
|
||||
dontAddStaticConfigureFlags = true;
|
||||
configurePlatforms = [];
|
||||
configurePlatforms = [ ];
|
||||
|
||||
propagatedBuildInputs = [ camlzip extlib ];
|
||||
|
||||
|
|
Loading…
Reference in a new issue