From e99630a3499cfcb9a0373da7daef946522b01168 Mon Sep 17 00:00:00 2001 From: Thomas Butter Date: Thu, 14 May 2026 11:21:09 +0000 Subject: [PATCH] ocamlPackages.ocb-stubblr: 0.1.0 -> 0.1.1 --- .../ocaml-modules/ocb-stubblr/default.nix | 4 ++-- .../ocaml-modules/ocb-stubblr/pkg-config.patch | 13 +++++++------ 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/pkgs/development/ocaml-modules/ocb-stubblr/default.nix b/pkgs/development/ocaml-modules/ocb-stubblr/default.nix index b7b93ebd5e5a..3ca59f130788 100644 --- a/pkgs/development/ocaml-modules/ocb-stubblr/default.nix +++ b/pkgs/development/ocaml-modules/ocb-stubblr/default.nix @@ -11,12 +11,12 @@ stdenv.mkDerivation rec { pname = "ocaml${ocaml.version}-ocb-stubblr"; - version = "0.1.0"; + version = "0.1.1"; src = fetchzip { url = "https://github.com/pqwy/ocb-stubblr/releases/download/v${version}/ocb-stubblr-${version}.tbz"; name = "src.tar.bz"; - sha256 = "0hpds1lkq4j8wgslv7hnirgfrjmqi36h5rarpw9mwf24gfp5ays2"; + hash = "sha256-Zd9a2EFT5j944xCFmWD4Td21VB7uGHZoNE4yvgfI9y0="; }; patches = [ ./pkg-config.patch ]; diff --git a/pkgs/development/ocaml-modules/ocb-stubblr/pkg-config.patch b/pkgs/development/ocaml-modules/ocb-stubblr/pkg-config.patch index d86b3f8da9f1..2be484974d4e 100644 --- a/pkgs/development/ocaml-modules/ocb-stubblr/pkg-config.patch +++ b/pkgs/development/ocaml-modules/ocb-stubblr/pkg-config.patch @@ -1,6 +1,6 @@ ---- a/src/ocb_stubblr.ml 1970-01-01 00:00:01.000000000 +0000 -+++ b/src/ocb_stubblr.ml 2016-12-04 11:10:10.000000000 +0000 -@@ -31,20 +31,9 @@ +--- a/src/ocb_stubblr.ml ++++ b/src/ocb_stubblr.ml +@@ -31,21 +31,8 @@ (* XXX Would be nice to move pkg-config results to a build artefact. *) @@ -12,8 +12,10 @@ - let var = "PKG_CONFIG_PATH" - - let path () = -- Lazy.force opam_prefix / "lib" / "pkgconfig" :: -- (try [Sys.getenv var] with Not_found -> []) |> String.concat ~sep:":" +- let opam = Lazy.force opam_prefix +- and rest = try [Sys.getenv var] with Not_found -> [] in +- opam/"lib"/"pkgconfig" :: opam/"share"/"pkgconfig" :: rest +- |> String.concat ~sep:":" - let run ~flags package = - let cmd = strf "%s=%s pkg-config %s %s 2>/dev/null" @@ -22,4 +24,3 @@ + package (String.concat ~sep:" " flags) in try `Res (run_and_read cmd) with Failure _ -> `Nonexistent end -