diff options
| author | Kirill Boltaev <aske@fmap.me> | 2016-10-05 11:32:30 +0400 |
|---|---|---|
| committer | vbgl <vbgl@users.noreply.github.com> | 2016-10-05 09:32:30 +0200 |
| commit | 3e646865f4eb5216117dc49f3c9fb4a02ad2313b (patch) | |
| tree | 9418314db159ba326550bf4af9df1e7aa9a75332 /pkgs/development/ocaml-modules/lablgtk | |
| parent | 916364af72f15e7635387889d883b605948b1f1d (diff) | |
| download | nixpkgs-3e646865f4eb5216117dc49f3c9fb4a02ad2313b.tar nixpkgs-3e646865f4eb5216117dc49f3c9fb4a02ad2313b.tar.gz nixpkgs-3e646865f4eb5216117dc49f3c9fb4a02ad2313b.tar.bz2 nixpkgs-3e646865f4eb5216117dc49f3c9fb4a02ad2313b.tar.lz nixpkgs-3e646865f4eb5216117dc49f3c9fb4a02ad2313b.tar.xz nixpkgs-3e646865f4eb5216117dc49f3c9fb4a02ad2313b.tar.zst nixpkgs-3e646865f4eb5216117dc49f3c9fb4a02ad2313b.zip | |
treewide: use ocaml.version (#19192)
Diffstat (limited to 'pkgs/development/ocaml-modules/lablgtk')
| -rw-r--r-- | pkgs/development/ocaml-modules/lablgtk/2.14.0.nix | 9 | ||||
| -rw-r--r-- | pkgs/development/ocaml-modules/lablgtk/default.nix | 14 |
2 files changed, 11 insertions, 12 deletions
diff --git a/pkgs/development/ocaml-modules/lablgtk/2.14.0.nix b/pkgs/development/ocaml-modules/lablgtk/2.14.0.nix index 3b6ff64daea..ba966b68002 100644 --- a/pkgs/development/ocaml-modules/lablgtk/2.14.0.nix +++ b/pkgs/development/ocaml-modules/lablgtk/2.14.0.nix @@ -1,13 +1,12 @@ { stdenv, fetchurl, ocaml, findlib, pkgconfig, gtk2, libgnomecanvas, libglade, gtksourceview, camlp4 }: let - ocaml_version = (builtins.parseDrvName ocaml.name).version; pname = "lablgtk"; - version = "2.14.0"; in stdenv.mkDerivation (rec { name = "${pname}-${version}"; + version = "2.14.0"; src = fetchurl { url = "https://forge.ocamlcore.org/frs/download.php/561/${name}.tar.gz"; @@ -16,12 +15,12 @@ stdenv.mkDerivation (rec { buildInputs = [ ocaml findlib pkgconfig gtk2 libgnomecanvas libglade gtksourceview camlp4 ]; - configureFlags = "--with-libdir=$(out)/lib/ocaml/${ocaml_version}/site-lib"; + configureFlags = "--with-libdir=$(out)/lib/ocaml/${ocaml.version}/site-lib"; buildFlags = "world"; preInstall = '' - mkdir -p $out/lib/ocaml/${ocaml_version}/site-lib - export OCAMLPATH=$out/lib/ocaml/${ocaml_version}/site-lib/:$OCAMLPATH + mkdir -p $out/lib/ocaml/${ocaml.version}/site-lib + export OCAMLPATH=$out/lib/ocaml/${ocaml.version}/site-lib/:$OCAMLPATH ''; meta = { diff --git a/pkgs/development/ocaml-modules/lablgtk/default.nix b/pkgs/development/ocaml-modules/lablgtk/default.nix index 0e5772632d5..93ebf4b9c92 100644 --- a/pkgs/development/ocaml-modules/lablgtk/default.nix +++ b/pkgs/development/ocaml-modules/lablgtk/default.nix @@ -1,15 +1,15 @@ {stdenv, fetchurl, ocaml, findlib, pkgconfig, gtk2, libgnomecanvas, libglade, gtksourceview, camlp4}: let - ocaml_version = (builtins.parseDrvName ocaml.name).version; pname = "lablgtk"; - version = "2.18.3"; in -assert stdenv.lib.versionAtLeast ocaml_version "3.12"; +assert stdenv.lib.versionAtLeast ocaml.version "3.12"; -stdenv.mkDerivation { +stdenv.mkDerivation rec { name = "${pname}-${version}"; + version = "2.18.3"; + src = fetchurl { url = https://forge.ocamlcore.org/frs/download.php/1479/lablgtk-2.18.3.tar.gz; sha256 = "1bybn3jafxf4cx25zvn8h2xj9agn1xjbn7j3ywxxqx6az7rfnnwp"; @@ -17,12 +17,12 @@ stdenv.mkDerivation { buildInputs = [ocaml findlib pkgconfig gtk2 libgnomecanvas libglade gtksourceview camlp4]; - configureFlags = "--with-libdir=$(out)/lib/ocaml/${ocaml_version}/site-lib"; + configureFlags = "--with-libdir=$(out)/lib/ocaml/${ocaml.version}/site-lib"; buildFlags = "world"; preInstall = '' - mkdir -p $out/lib/ocaml/${ocaml_version}/site-lib - export OCAMLPATH=$out/lib/ocaml/${ocaml_version}/site-lib/:$OCAMLPATH + mkdir -p $out/lib/ocaml/${ocaml.version}/site-lib + export OCAMLPATH=$out/lib/ocaml/${ocaml.version}/site-lib/:$OCAMLPATH ''; meta = with stdenv.lib; { |