From patchwork Sat Sep 3 12:08:27 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: M X-Patchwork-Id: 42165 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 5B9C427BBEA; Sat, 3 Sep 2022 13:09:12 +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=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI,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 E368027BBE9 for ; Sat, 3 Sep 2022 13:09:11 +0100 (BST) Received: from localhost ([::1]:36566 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oURxW-0007JI-1f for patchwork@mira.cbaines.net; Sat, 03 Sep 2022 08:09:10 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:53338) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oURxO-0007In-DV for guix-patches@gnu.org; Sat, 03 Sep 2022 08:09:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:52411) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oURxO-0006cL-4C for guix-patches@gnu.org; Sat, 03 Sep 2022 08:09:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1oURxN-0002qU-Uq for guix-patches@gnu.org; Sat, 03 Sep 2022 08:09:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#57560] [PATCH 4/4] gnu: hashcat: Fix cross-compilation. Resent-From: Maxime Devos Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 03 Sep 2022 12:09:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 57560 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 57560@debbugs.gnu.org Cc: Maxime Devos Received: via spool by 57560-submit@debbugs.gnu.org id=B57560.166220691310882 (code B ref 57560); Sat, 03 Sep 2022 12:09:01 +0000 Received: (at 57560) by debbugs.gnu.org; 3 Sep 2022 12:08:33 +0000 Received: from localhost ([127.0.0.1]:41103 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oURwu-0002pQ-UU for submit@debbugs.gnu.org; Sat, 03 Sep 2022 08:08:33 -0400 Received: from baptiste.telenet-ops.be ([195.130.132.51]:36488) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oURws-0002p1-OV for 57560@debbugs.gnu.org; Sat, 03 Sep 2022 08:08:31 -0400 Received: from localhost.localdomain ([IPv6:2a02:1811:8c09:9d00:5dba:d409:33f7:a16]) by baptiste.telenet-ops.be with bizsmtp id FQ8U2800e20ykKC01Q8V2Y; Sat, 03 Sep 2022 14:08:29 +0200 From: Maxime Devos Date: Sat, 3 Sep 2022 14:08:27 +0200 Message-Id: <20220903120827.25648-4-maximedevos@telenet.be> X-Mailer: git-send-email 2.37.2 In-Reply-To: <20220903120827.25648-1-maximedevos@telenet.be> References: <20220903120827.25648-1-maximedevos@telenet.be> MIME-Version: 1.0 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=telenet.be; s=r22; t=1662206909; bh=qMf1Yl9J+0OdJjyvxxRKLy7IObywe7hVMb9Zuj2t7qM=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=CU8RCC1o1qxtqzwGpXjdB9XPInO6Skk43X/Gf+Xa07bb+ioNds6Xr2e28piLIMm+f 9GGvo66gnCBLF2ZlNeN5tAwyEQUG6N8Vt2JwZu6DkwI4nbShFNalmAUTlQHDKWIBEE WoELkq4pcmzndAnqkJGeCachTIOEIJecqeKJqJcjoZpXJOHr/GEf8+B5PNjy96EOOm cM87G0l718pWFnQXj1h3DSgTJ7xi/Qe25xTjlalS/q/a6ZdltZMWlHInq0HKKzvnof asY51LSTf5bfdC2jWlep/GKahtEQvCfrkVP8NQoW/1/Im6rma4euTIcQ0wWV3QQKlp ZU5jHnRoNfAmg== 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" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/password-utils.scm (hashcat)[native-inputs]: Move to ... (hashcat)[inputs]: ... here. (hashcat)[arguments]<#:make-flags>: Set AR and CC. --- gnu/packages/password-utils.scm | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/gnu/packages/password-utils.scm b/gnu/packages/password-utils.scm index 172f633449..f92c47d539 100644 --- a/gnu/packages/password-utils.scm +++ b/gnu/packages/password-utils.scm @@ -1110,8 +1110,8 @@ (define-public pass-rotate your online accounts makes it necessary.") (license license:expat))) -;; XXX: move this import upwards before merging this patch -(use-modules (gnu packages digest)) +;; XXX: move these imports upwards before merging this patch +(use-modules (gnu packages digest) (guix utils)) (define-public hashcat (package (name "hashcat") @@ -1130,13 +1130,13 @@ (define-public hashcat ;; TODO: Unbundle LZMA-SDK as well #~(for-each delete-file-recursively '("deps/zlib" "deps/xxHash" "deps/OpenCL-Headers"))))) - (native-inputs - (list opencl-headers)) - (inputs (list minizip xxhash zlib)) + (inputs (list minizip opencl-headers xxhash zlib)) (build-system gnu-build-system) (arguments (list #:tests? #f ;no tests - #:make-flags #~(list (string-append "PREFIX=" + #:make-flags #~(list (string-append "AR=" #$(ar-for-target)) + (string-append "CC=" #$(cc-for-target)) + (string-append "PREFIX=" #$output) (string-append "USE_SYSTEM_ZLIB=1") (string-append "USE_SYSTEM_OPENCL=1")