From patchwork Wed Nov 6 07:36:24 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hilton Chain X-Patchwork-Id: 69917 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 F1FE927BBEA; Wed, 6 Nov 2024 07:39:14 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-4.4 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,FROM_SUSPICIOUS_NTLD,MAILING_LIST_MULTI,PDS_OTHER_BAD_TLD, RCVD_IN_DNSWL_BLOCKED,RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL, RCVD_IN_VALIDITY_SAFE,SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham 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 63CC227BBE2 for ; Wed, 6 Nov 2024 07:39:14 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1t8acJ-0008Gw-AX; Wed, 06 Nov 2024 02:38:15 -0500 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 1t8acB-0008Fq-7m for guix-patches@gnu.org; Wed, 06 Nov 2024 02:38:09 -0500 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 1t8acA-0003me-Vx for guix-patches@gnu.org; Wed, 06 Nov 2024 02:38:07 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:References:In-Reply-To:Date:From:To:Subject; bh=ayBp3ZnTj0NIhiTXDKUmccCvnNVh9nTBfYjnABch84s=; b=d/BEzFaWfGZI5O1fDhIF1WMOPhaJPTTDiVedJleneHj3HFhN8dQmw+JUpg8PvSD5IFDh3DS0Napj3LAuHMnc2huvdNHaHm3TrbnqLDUCGDAXCb7+nXYxXBGqNXqC07hYMXDXtrZUdoXYBLI7x8Xwr0yo5/d7YlVbroqd0mWN70q5QSXSfWwzS5E0tDgUdWhV9zFP7d5AbQqmib07pgzAdzWd4ffmXXx3IYWNmAWpJYTujwp87pkhtwB8zIu3jGHAyuGCQursxIYUr1kxBZCV2SLcmHHbkyNJrVGZuylqMGK/4ADeFFz32lpVEwr6AGSHOPA5ticrCukKZQ0q/eVOzQ==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1t8acA-0000eY-QL for guix-patches@gnu.org; Wed, 06 Nov 2024 02:38:06 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#74223] [PATCH 08/11] gnu: Add hyprland. Resent-From: Hilton Chain Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 06 Nov 2024 07:38:06 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 74223 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 74223@debbugs.gnu.org Cc: Hilton Chain Received: via spool by 74223-submit@debbugs.gnu.org id=B74223.17308786392380 (code B ref 74223); Wed, 06 Nov 2024 07:38:06 +0000 Received: (at 74223) by debbugs.gnu.org; 6 Nov 2024 07:37:19 +0000 Received: from localhost ([127.0.0.1]:39118 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1t8abO-0000cJ-Ma for submit@debbugs.gnu.org; Wed, 06 Nov 2024 02:37:19 -0500 Received: from mail.boiledscript.com ([144.168.59.46]:43388) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1t8abK-0000ao-43 for 74223@debbugs.gnu.org; Wed, 06 Nov 2024 02:37:14 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ultrarare.space; s=dkim; t=1730878628; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=ayBp3ZnTj0NIhiTXDKUmccCvnNVh9nTBfYjnABch84s=; b=LXy9QbwzFLBBQr8knSHOCQLLx1BvqepXGdDPLnSJZhx9YqZxXLawRaRECjS8AsLoGo8ryd 3NRtU4M6jwsJ88AC5lYjEUqTZMsliWxT1Kwt0mWdq26af842UwOOZynxDoQaYcWlEZBsAa o0wfC25FyEOdWKSLt1wNObkyk4StSJq6g+PKEHs7EzY3b8IVs8JsXHS3KVgO4hCirauFRO mSksZ0TXU6ydMLkixV2uEmE6iqoVG0Kis88AMMfXWaXvPMzq2zlakcGwY/vTlF2DA0n8bO NS9FwE/Glf0reivQf13jQ1K3rm/b1sI0tEi+pVO8f+w/YyPte9VVIYVb86yi9g== Authentication-Results: mail.boiledscript.com; auth=pass smtp.mailfrom=hako@ultrarare.space Date: Wed, 6 Nov 2024 15:36:24 +0800 Message-ID: In-Reply-To: References: MIME-Version: 1.0 X-Spamd-Bar: ----- 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: , Reply-to: Hilton Chain X-ACL-Warn: , Hilton Chain via Guix-patches X-Patchwork-Original-From: Hilton Chain via Guix-patches via From: Hilton Chain 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 * gnu/packages/wm.scm (hyprland): New variable. Change-Id: Idffb9309f61f30c5523e69bb6313162cff87b275 --- gnu/packages/wm.scm | 79 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 79 insertions(+) diff --git a/gnu/packages/wm.scm b/gnu/packages/wm.scm index 836d4b6c04..01a6677e9a 100644 --- a/gnu/packages/wm.scm +++ b/gnu/packages/wm.scm @@ -118,17 +118,21 @@ (define-module (gnu packages wm) #:use-module (gnu packages build-tools) #:use-module (gnu packages calendar) #:use-module (gnu packages check) + #:use-module (gnu packages cmake) #:use-module (gnu packages compression) + #:use-module (gnu packages cpp) #:use-module (gnu packages crates-io) #:use-module (gnu packages crates-graphics) #:use-module (gnu packages datastructures) #:use-module (gnu packages docbook) #:use-module (gnu packages documentation) + #:use-module (gnu packages engineering) #:use-module (gnu packages flex) #:use-module (gnu packages fontutils) #:use-module (gnu packages freedesktop) #:use-module (gnu packages fribidi) #:use-module (gnu packages gawk) + #:use-module (gnu packages gcc) #:use-module (gnu packages gettext) #:use-module (gnu packages gl) #:use-module (gnu packages glib) @@ -314,6 +318,81 @@ (define-public herbstluftwm (home-page "https://herbstluftwm.org") (license license:bsd-2))) +(define-public hyprland + (package + (name "hyprland") + (version "0.44.1") + (source (origin + (method url-fetch) + (uri (string-append "https://github.com/hyprwm/Hyprland" + "/releases/download/v" version + "/source-v" version ".tar.gz")) + (modules '((guix build utils))) + (snippet + '(begin + ;; Remove bundled sources and hyprpm utility. + (substitute* "CMakeLists.txt" + (("^add_subdirectory\\(hyprpm\\).*") "")) + (for-each delete-file-recursively + '("hyprpm" + "subprojects")))) + (sha256 + (base32 + "0qzwdlj0bwj267285l3gjklhafn3bln90z985yws4j5cbp7bj0d9")))) + (build-system cmake-build-system) + (arguments + (list #:cmake cmake-3.30 + #:tests? #f ;No tests. + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'fix-path + (lambda* (#:key inputs #:allow-other-keys) + (substitute* "src/xwayland/Server.cpp" + (("Xwayland( \\{\\})" _ suffix) + (string-append + (search-input-file inputs "bin/Xwayland") + suffix))) + (substitute* (find-files "src" "\\.cpp$") + (("/usr/local(/bin/Hyprland)" _ path) + (string-append #$output path)) + (("/usr") #$output) + (("\\<(addr2line|cat|lspci|nm)\\>" cmd) + (search-input-file + inputs (string-append "bin/" cmd))))))))) + (native-inputs + (list gcc-14 + hyprwayland-scanner + (module-ref (resolve-interface + '(gnu packages commencement)) + 'ld-wrapper) + pkg-config)) + (inputs + (list aquamarine + binutils + cairo + hyprcursor + hyprland-protocols + hyprlang + hyprutils + libinput-minimal + libxcursor + libxkbcommon + mesa + pango + pciutils + udis86 + wayland + wayland-protocols + xcb-util-errors + xcb-util-wm + xorg-server-xwayland)) + (home-page "https://hyprland.org/") + (synopsis "Dynamic tiling Wayland compositor") + (description + "Hyprland is a dynamic tiling Wayland compositor that doesn't sacrifice on +its looks.") + (license license:bsd-3))) + (define-public i3status (package (name "i3status")