diff options
author | Artturi <Artturin@artturin.com> | 2023-08-04 22:56:50 +0300 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-08-04 22:56:50 +0300 |
commit | f9e7c7f7e5deba3339e5cc45ab3e4e17414ee78e (patch) | |
tree | 72831e582d9c7ded5a4e905c0d9232bb1aec5820 | |
parent | a22f9d2aed8017fbeedb7da1dd03a6b8dd55967e (diff) | |
parent | 2b8a2792c05dd54f9f38bd26e494956be74fdd76 (diff) | |
download | nixpkgs-f9e7c7f7e5deba3339e5cc45ab3e4e17414ee78e.tar nixpkgs-f9e7c7f7e5deba3339e5cc45ab3e4e17414ee78e.tar.gz nixpkgs-f9e7c7f7e5deba3339e5cc45ab3e4e17414ee78e.tar.bz2 nixpkgs-f9e7c7f7e5deba3339e5cc45ab3e4e17414ee78e.tar.lz nixpkgs-f9e7c7f7e5deba3339e5cc45ab3e4e17414ee78e.tar.xz nixpkgs-f9e7c7f7e5deba3339e5cc45ab3e4e17414ee78e.tar.zst nixpkgs-f9e7c7f7e5deba3339e5cc45ab3e4e17414ee78e.zip |
Merge pull request #247160 from wineee/wayfire-rec
4 files changed, 38 insertions, 37 deletions
diff --git a/pkgs/applications/window-managers/wayfire/default.nix b/pkgs/applications/window-managers/wayfire/default.nix index ab68bc58ee0..133b561be62 100644 --- a/pkgs/applications/window-managers/wayfire/default.nix +++ b/pkgs/applications/window-managers/wayfire/default.nix @@ -21,16 +21,16 @@ , xorg }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "wayfire"; version = "0.7.5"; src = fetchFromGitHub { owner = "WayfireWM"; - repo = pname; - rev = "v${version}"; + repo = "wayfire"; + rev = "v${finalAttrs.version}"; fetchSubmodules = true; - sha256 = "sha256-Z+rR9pY244I3i/++XZ4ROIkq3vtzMgcxxHvJNxFD9is="; + hash = "sha256-Z+rR9pY244I3i/++XZ4ROIkq3vtzMgcxxHvJNxFD9is="; }; nativeBuildInputs = [ @@ -40,7 +40,6 @@ stdenv.mkDerivation rec { wayland-scanner ]; - buildInputs = [ wf-config libdrm @@ -78,11 +77,12 @@ stdenv.mkDerivation rec { passthru.providedSessions = [ "wayfire" ]; - meta = with lib; { + meta = { homepage = "https://wayfire.org/"; description = "3D Wayland compositor"; - license = licenses.mit; - maintainers = with maintainers; [ qyliss wucke13 rewine ]; - platforms = platforms.unix; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ qyliss wucke13 rewine ]; + platforms = lib.platforms.unix; + mainProgram = "wayfire"; }; -} +}) diff --git a/pkgs/applications/window-managers/wayfire/wcm.nix b/pkgs/applications/window-managers/wayfire/wcm.nix index a6770218552..48be049560b 100644 --- a/pkgs/applications/window-managers/wayfire/wcm.nix +++ b/pkgs/applications/window-managers/wayfire/wcm.nix @@ -16,16 +16,16 @@ , libxml2 }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "wcm"; version = "0.7.5"; src = fetchFromGitHub { owner = "WayfireWM"; - repo = pname; - rev = "v${version}"; + repo = "wcm"; + rev = "v${finalAttrs.version}"; fetchSubmodules = true; - sha256 = "sha256-LJR9JGl49o4O6LARofz3jOeAqseGcmzVhMnhk/aobUU="; + hash = "sha256-LJR9JGl49o4O6LARofz3jOeAqseGcmzVhMnhk/aobUU="; }; nativeBuildInputs = [ @@ -51,11 +51,12 @@ stdenv.mkDerivation rec { "-Denable_wdisplays=false" ]; - meta = with lib; { + meta = { homepage = "https://github.com/WayfireWM/wcm"; description = "Wayfire Config Manager"; - license = licenses.mit; - maintainers = with maintainers; [ qyliss wucke13 rewine ]; - platforms = platforms.unix; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ qyliss wucke13 rewine ]; + platforms = lib.platforms.unix; + mainProgram = "wcm"; }; -} +}) diff --git a/pkgs/applications/window-managers/wayfire/wf-config.nix b/pkgs/applications/window-managers/wayfire/wf-config.nix index 19435a87395..923c3930c9b 100644 --- a/pkgs/applications/window-managers/wayfire/wf-config.nix +++ b/pkgs/applications/window-managers/wayfire/wf-config.nix @@ -11,15 +11,15 @@ , libxml2 }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "wf-config"; version = "0.7.1"; src = fetchFromGitHub { owner = "WayfireWM"; - repo = pname; - rev = "v${version}"; - sha256 = "sha256-ADUBvDJcPYEB9ZvaFIgTfemo1WYwiWgCWX/z2yrEPtA="; + repo = "wf-config"; + rev = "v${finalAttrs.version}"; + hash = "sha256-ADUBvDJcPYEB9ZvaFIgTfemo1WYwiWgCWX/z2yrEPtA="; }; nativeBuildInputs = [ @@ -50,11 +50,11 @@ stdenv.mkDerivation rec { doCheck = true; - meta = with lib; { + meta = { homepage = "https://github.com/WayfireWM/wf-config"; description = "Library for managing configuration files, written for Wayfire"; - license = licenses.mit; - maintainers = with maintainers; [ qyliss wucke13 rewine ]; - platforms = platforms.unix; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ qyliss wucke13 rewine ]; + platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/applications/window-managers/wayfire/wf-shell.nix b/pkgs/applications/window-managers/wayfire/wf-shell.nix index 10e16a6573e..7af794db788 100644 --- a/pkgs/applications/window-managers/wayfire/wf-shell.nix +++ b/pkgs/applications/window-managers/wayfire/wf-shell.nix @@ -13,16 +13,16 @@ , pulseaudio }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "wf-shell"; version = "0.7.0"; src = fetchFromGitHub { owner = "WayfireWM"; - repo = pname; - rev = "v${version}"; + repo = "wf-shell"; + rev = "v${finalAttrs.version}"; fetchSubmodules = true; - sha256 = "sha256-iQUBuNjbZuf51A69RC6NsMHFZCFRv+d9XZ0HtP6OpOA="; + hash = "sha256-iQUBuNjbZuf51A69RC6NsMHFZCFRv+d9XZ0HtP6OpOA="; }; nativeBuildInputs = [ @@ -43,11 +43,11 @@ stdenv.mkDerivation rec { mesonFlags = [ "--sysconfdir /etc" ]; - meta = with lib; { + meta = { homepage = "https://github.com/WayfireWM/wf-shell"; description = "GTK3-based panel for Wayfire"; - license = licenses.mit; - maintainers = with maintainers; [ qyliss wucke13 rewine ]; - platforms = platforms.unix; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ qyliss wucke13 rewine ]; + platforms = lib.platforms.unix; }; -} +}) |