From ef3db947b486b764ec36df377fd8c38f3c44c920 Mon Sep 17 00:00:00 2001 From: Xieamoe Date: Wed, 14 Feb 2024 03:43:15 -0800 Subject: [PATCH] package made independent --- rdricpp.scm | 42 +++++++++++++----------------------------- 1 file changed, 13 insertions(+), 29 deletions(-) diff --git a/rdricpp.scm b/rdricpp.scm index 992c44b..fe572ef 100644 --- a/rdricpp.scm +++ b/rdricpp.scm @@ -1,44 +1,28 @@ - (define-module (gd-tools) +(define-module (gd-tools) #:use-module (gnu packages cmake) - #:use-module (gnu packages compression) #:use-module (gnu packages pkg-config) - #:use-module (gnu packages search) - #:use-module (gnu packages web) - #:use-module (gnu packages gcc) - #:use-module (gnu packages tls) - #:use-module (gnu packages cpp) - #:use-module (gnu packages glib) - #:use-module (gnu packages nss) - #:use-module (gnu packages datastructures) - - #:use-module (gnu packages certs) - #:use-module (gnu packages check) - #:use-module (guix build-system qt) - #:use-module (gnu packages curl) - #:use-module (guix utils) - #:use-module (guix search-paths) #:use-module (guix build-system cmake) - #:use-module (guix build-system gnu) #:use-module (guix download) #:use-module (guix gexp) - #:use-module (guix git-download) #:use-module (guix packages) + #:use-module (gnu packages check) #:use-module ((guix licenses) #:prefix license:)) (define-public catch2-full (package (name "Catch2") (version "3.5.2") - (source (local-file "../Catch2-3.5.2" "guile-checkout" - #:recursive? #t)) + (source (origin + (method url-fetch) + (uri "https://github.com/catchorg/Catch2/archive/refs/tags/v3.5.2.tar.gz") + (sha256 (base32 "0vhc8zg69idw8lp7vr4hdkhsf9scqba33wizz6rl0vxpksj47596")))) (build-system cmake-build-system) (arguments ( list #:cmake cmake #:tests? #f - ) - ) + )) (native-inputs (list @@ -79,20 +63,18 @@ ;;#:tests? #f #:configure-flags #~(list "-DGUIX=1") - ) - ) + )) (native-inputs (list gcc-13 pkg-config - )) (inputs - (list - catch2-full - )) + (list + catch2 + )) (synopsis "Rikaitan Deinflector Reference Implementation in C++.") (description @@ -102,5 +84,7 @@ (list license:gpl3+ license:zlib)))) + + rdricpp