diff options
| author | Ulrik Strid <ulrik.strid@outlook.com> | 2024-02-06 13:50:29 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-02-06 13:50:29 +0100 |
| commit | 36ee9fdad2ce8f10f0a013e17de0f6e05e364c6e (patch) | |
| tree | 1ec127498d16c2d311a63a4ba7573ce0915f0671 /pkgs/development/ocaml-modules | |
| parent | 7c0a1290767428e9381541adf94bf5067fe37189 (diff) | |
| parent | 16e5d894040dd53752a86bb4431058c8de693600 (diff) | |
| download | nixlib-36ee9fdad2ce8f10f0a013e17de0f6e05e364c6e.tar nixlib-36ee9fdad2ce8f10f0a013e17de0f6e05e364c6e.tar.gz nixlib-36ee9fdad2ce8f10f0a013e17de0f6e05e364c6e.tar.bz2 nixlib-36ee9fdad2ce8f10f0a013e17de0f6e05e364c6e.tar.lz nixlib-36ee9fdad2ce8f10f0a013e17de0f6e05e364c6e.tar.xz nixlib-36ee9fdad2ce8f10f0a013e17de0f6e05e364c6e.tar.zst nixlib-36ee9fdad2ce8f10f0a013e17de0f6e05e364c6e.zip | |
Merge pull request #285204 from vbgl/ocaml-lablgtk-3.1.4
ocamlPackages.lablgtk3: 3.1.3 → 3.1.4
Diffstat (limited to 'pkgs/development/ocaml-modules')
| -rw-r--r-- | pkgs/development/ocaml-modules/lablgtk3/default.nix | 12 | ||||
| -rw-r--r-- | pkgs/development/ocaml-modules/lablgtk3/rsvg2.nix | 20 |
2 files changed, 25 insertions, 7 deletions
diff --git a/pkgs/development/ocaml-modules/lablgtk3/default.nix b/pkgs/development/ocaml-modules/lablgtk3/default.nix index bd820e8042a7..a6aa522f7c84 100644 --- a/pkgs/development/ocaml-modules/lablgtk3/default.nix +++ b/pkgs/development/ocaml-modules/lablgtk3/default.nix @@ -1,19 +1,17 @@ -{ lib, fetchFromGitHub, pkg-config, buildDunePackage, dune-configurator +{ lib, fetchurl, pkg-config, buildDunePackage, dune-configurator , gtk3, cairo2 , camlp-streams }: buildDunePackage rec { - version = "3.1.3"; + version = "3.1.4"; pname = "lablgtk3"; minimalOCamlVersion = "4.05"; - src = fetchFromGitHub { - owner = "garrigue"; - repo = "lablgtk"; - rev = version; - sha256 = "sha256-1kXJP+tKudP3qfosTgZAQueNK46H9aLevEj6wxPKDWY="; + src = fetchurl { + url = "https://github.com/garrigue/lablgtk/releases/download/${version}/lablgtk3-${version}.tbz"; + hash = "sha256-bxEVMzfnaH5yHVxAmifNYOy8GnSivLLgSE/9+1yxBI4="; }; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/development/ocaml-modules/lablgtk3/rsvg2.nix b/pkgs/development/ocaml-modules/lablgtk3/rsvg2.nix new file mode 100644 index 000000000000..463f50f18e62 --- /dev/null +++ b/pkgs/development/ocaml-modules/lablgtk3/rsvg2.nix @@ -0,0 +1,20 @@ +{ buildDunePackage +, dune-configurator +, lablgtk3 +, librsvg +, pkg-config +}: + +buildDunePackage rec { + pname = "lablgtk3-rsvg2"; + + inherit (lablgtk3) version src; + + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ dune-configurator ]; + propagatedBuildInputs = [ lablgtk3 librsvg ]; + + meta = lablgtk3.meta // { + description = "OCaml interface to Gnome rsvg2 library"; + }; +} |