From patchwork Sat May 3 14:38:26 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?S=C3=B6ren_Tempel?= X-Patchwork-Id: 42275 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id F114B27BC4A; Sat, 3 May 2025 15:41:24 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-6.4 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED, RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE, SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 7CE6727BC49 for ; Sat, 3 May 2025 15:41:23 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uBE3C-0002ye-PY; Sat, 03 May 2025 10:41:11 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1uBE37-0002xt-HT for guix-patches@gnu.org; Sat, 03 May 2025 10:41:05 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1uBE37-0006IL-5b for guix-patches@gnu.org; Sat, 03 May 2025 10:41:05 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:Date:From:To:Subject; bh=9zFUkKEZHM4xQLXe05LXcHHenSzjUdjZ5+VYSZLaePI=; b=mJC8NFdGD8FKHI9RQZ+rIstQPiopAHXSatFeaf9MIBwcV/tIR+PYIglaS8O2jErKxGSJKStXMD55l7xI6Q0xDiFIhN1ZQpDuMXJqNkf85M9Tsyc6P5PATXB1rXa3mQ2/BcyXWEkvqGXy7/nvRj7LQoWW2Y1mzL/OF6C84TgMZfUuqTIy+PnNmcH5T5be0UHbqTWcMqMesUnJR5c4VRA5L78uff8yLar6f/dyCbOe2DkwxqsSZooYi8kDBShMRcEV6DT7r8KC1/TuLAd+fst/wf5yCdtiv4vWbpbfo/cSQ6ejw7oxTDQUz+cpq46KvDNiAUZ0iPdZJ8TIrh8ecgUInA==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1uBE34-0002xQ-0w; Sat, 03 May 2025 10:41:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#78231] [PATCH] ocaml: binsec: Wrap program to set OCAMLPATH Resent-From: soeren@soeren-tempel.net Original-Sender: "Debbugs-submit" Resent-CC: julien@lepiller.eu, pukkamustard@posteo.net, guix-patches@gnu.org Resent-Date: Sat, 03 May 2025 14:41:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 78231 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 78231@debbugs.gnu.org Cc: jgart@dismail.de, Julien Lepiller , pukkamustard X-Debbugs-Original-To: guix-patches@gnu.org X-Debbugs-Original-Xcc: Julien Lepiller , pukkamustard Received: via spool by submit@debbugs.gnu.org id=B.174628320911121 (code B ref -1); Sat, 03 May 2025 14:41:01 +0000 Received: (at submit) by debbugs.gnu.org; 3 May 2025 14:40:09 +0000 Received: from localhost ([127.0.0.1]:42160 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1uBE2C-0002t6-Nz for submit@debbugs.gnu.org; Sat, 03 May 2025 10:40:09 -0400 Received: from lists.gnu.org ([2001:470:142::17]:40238) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1uBE29-0002oS-JT for submit@debbugs.gnu.org; Sat, 03 May 2025 10:40:07 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1uBE1y-0002ct-Bs for guix-patches@gnu.org; Sat, 03 May 2025 10:39:55 -0400 Received: from magnesium.8pit.net ([45.76.88.171]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1uBE1v-0005ue-U3; Sat, 03 May 2025 10:39:54 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; s=opensmtpd; bh=9zFUkKEZ HM4xQLXe05LXcHHenSzjUdjZ5+VYSZLaePI=; h=date:subject:cc:to:from; d=soeren-tempel.net; b=ETIyLCy3YVSr0A5lrnF1D7zPiIl7DCjMY5WRkLo8RfTboFM cyuSVyYQnYP29XNaDmL1yBtDKoeSm+nRtuIiS3rgz9it2z/Gn0sKAXCTNU9NHSabGuc/gW aK5kTxx3TPG7EZ6JRv/Q7j1Noa3Kr8s3fXDZ+jWa9lNDAhycABPT+o= Received: from localhost ( [2a02:560:4d21:3f00:11d2:aa46:9365:87a6]) by magnesium.8pit.net (OpenSMTPD) with ESMTPSA id 8dbd970f (TLSv1.3:TLS_AES_256_GCM_SHA384:256:YES); Sat, 3 May 2025 16:39:46 +0200 (CEST) From: soeren@soeren-tempel.net Date: Sat, 3 May 2025 16:38:26 +0200 Message-ID: <739a1da5e980801aa40d3e81d84d30ba633bae70.1746283105.git.soeren@soeren-tempel.net> X-Mailer: git-send-email 2.49.0 MIME-Version: 1.0 Received-SPF: pass client-ip=45.76.88.171; envelope-from=soeren@soeren-tempel.net; helo=magnesium.8pit.net X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, RCVD_IN_VALIDITY_SAFE_BLOCKED=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches From: Sören Tempel Otherwise, dune plugins cannot be loaded which results in some command line options to not work correctly. For example, binsec --help errors with "The library "binsec.sse.checkct" can't be found in the search paths". To fix this, this patch adds a wrap-programs phase. Fixes https://issues.guix.gnu.org/69996 * gnu/packages/ocaml.scm (binsec) : Add wrap-programs phase. --- gnu/packages/ocaml.scm | 11 +++++++++++ 1 file changed, 11 insertions(+) base-commit: 415e3d98d6faf5fd3d1b7b3daa2f20636e4ff822 diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index a5632c6ad1..e86f59d2b3 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -1419,6 +1419,17 @@ (define-public binsec (sha256 (base32 "1szfqb6rj19w2jdyaxdgy3plhgr7picijf7l4k5qq80kna2h0zm8")))) (build-system dune-build-system) + (arguments + (list #:phases + #~(modify-phases %standard-phases + (add-after 'install 'wrap-programs + (lambda _ + (let ((ocamlpath + `(,(string-append #$output "/lib/ocaml/site-lib") + ,@(search-path-as-string->list (getenv "OCAMLPATH"))))) + (wrap-program (string-append #$output "/bin/" "binsec") + `("OCAMLPATH" ":" prefix ,ocamlpath)))))))) + (inputs (list bash-minimal)) (native-inputs (list gmp ocaml-qcheck ocaml-ounit2)) (propagated-inputs (list dune-site ocaml-base