From 92d355610cf8121962a70a57cf7aa5eec90866d9 Mon Sep 17 00:00:00 2001 From: Anderson Torres Date: Fri, 6 Sep 2024 21:10:16 -0300 Subject: [PATCH 1/5] lavalauncher: nixfmt-rfc-style - get rid of `with lib` --- pkgs/by-name/la/lavalauncher/package.nix | 45 ++++++++++++++---------- 1 file changed, 27 insertions(+), 18 deletions(-) diff --git a/pkgs/by-name/la/lavalauncher/package.nix b/pkgs/by-name/la/lavalauncher/package.nix index 77ad5e5901a9..4c9ea7336ac9 100644 --- a/pkgs/by-name/la/lavalauncher/package.nix +++ b/pkgs/by-name/la/lavalauncher/package.nix @@ -1,16 +1,17 @@ -{ lib -, stdenv -, fetchgit -, meson -, ninja -, pkg-config -, scdoc -, wayland-scanner -, cairo -, librsvg -, libxkbcommon -, wayland -, wayland-protocols +{ + lib, + cairo, + fetchgit, + librsvg, + libxkbcommon, + meson, + ninja, + pkg-config, + scdoc, + stdenv, + wayland, + wayland-protocols, + wayland-scanner, }: stdenv.mkDerivation rec { @@ -24,7 +25,15 @@ stdenv.mkDerivation rec { }; depsBuildBuild = [ pkg-config ]; - nativeBuildInputs = [ meson ninja pkg-config scdoc wayland-scanner ]; + + nativeBuildInputs = [ + meson + ninja + pkg-config + scdoc + wayland-scanner + ]; + buildInputs = [ cairo librsvg @@ -33,7 +42,7 @@ stdenv.mkDerivation rec { wayland-protocols ]; - meta = with lib; { + meta = { homepage = "https://git.sr.ht/~leon_plickat/lavalauncher"; description = "Simple launcher panel for Wayland desktops"; longDescription = '' @@ -52,9 +61,9 @@ stdenv.mkDerivation rec { The Wayland compositor must implement the Layer-Shell and XDG-Output for LavaLauncher to work. ''; - license = licenses.gpl3Plus; - maintainers = with maintainers; [ AndersonTorres ]; - platforms = with platforms; unix; + license = lib.licenses.gpl3Plus; mainProgram = "lavalauncher"; + maintainers = with lib.maintainers; [ AndersonTorres ]; + inherit (wayland.meta) platforms; }; } From 9ddee15c101db98ed581a10bc192a02f18e5ffa4 Mon Sep 17 00:00:00 2001 From: Anderson Torres Date: Fri, 6 Sep 2024 21:42:34 -0300 Subject: [PATCH 2/5] lavalauncher: finalAttrs --- pkgs/by-name/la/lavalauncher/package.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/la/lavalauncher/package.nix b/pkgs/by-name/la/lavalauncher/package.nix index 4c9ea7336ac9..bb9ea7d70bf6 100644 --- a/pkgs/by-name/la/lavalauncher/package.nix +++ b/pkgs/by-name/la/lavalauncher/package.nix @@ -14,13 +14,13 @@ wayland-scanner, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "lavalauncher"; version = "2.1.1"; src = fetchgit { url = "https://git.sr.ht/~leon_plickat/lavalauncher"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "hobhZ6s9m2xCdAurdj0EF1BeS88j96133zu+2jb1FMM="; }; @@ -61,9 +61,10 @@ stdenv.mkDerivation rec { The Wayland compositor must implement the Layer-Shell and XDG-Output for LavaLauncher to work. ''; + changelog = "https://git.sr.ht/~leon_plickat/lavalauncher/refs/${finalAttrs.src.rev}"; license = lib.licenses.gpl3Plus; mainProgram = "lavalauncher"; maintainers = with lib.maintainers; [ AndersonTorres ]; inherit (wayland.meta) platforms; }; -} +}) From 0121c9a1a5b1c9ff577b3eb50216a01369120d32 Mon Sep 17 00:00:00 2001 From: Anderson Torres Date: Fri, 6 Sep 2024 21:13:59 -0300 Subject: [PATCH 3/5] lavalauncher: use fetchFromSourcehut --- pkgs/by-name/la/lavalauncher/package.nix | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/la/lavalauncher/package.nix b/pkgs/by-name/la/lavalauncher/package.nix index bb9ea7d70bf6..aaaae6de6b5c 100644 --- a/pkgs/by-name/la/lavalauncher/package.nix +++ b/pkgs/by-name/la/lavalauncher/package.nix @@ -1,7 +1,7 @@ { lib, cairo, - fetchgit, + fetchFromSourcehut, librsvg, libxkbcommon, meson, @@ -18,10 +18,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "lavalauncher"; version = "2.1.1"; - src = fetchgit { - url = "https://git.sr.ht/~leon_plickat/lavalauncher"; + src = fetchFromSourcehut { + pname = "lavalauncher-source"; + inherit (finalAttrs) version; + owner = "~leon_plickat"; + repo = "lavalauncher"; rev = "v${finalAttrs.version}"; - sha256 = "hobhZ6s9m2xCdAurdj0EF1BeS88j96133zu+2jb1FMM="; + hash = "sha256-hobhZ6s9m2xCdAurdj0EF1BeS88j96133zu+2jb1FMM="; }; depsBuildBuild = [ pkg-config ]; From 08573721b88bd93a35506fedd71672c3be68586a Mon Sep 17 00:00:00 2001 From: Anderson Torres Date: Fri, 6 Sep 2024 21:20:59 -0300 Subject: [PATCH 4/5] lavalauncher: set strictDeps --- pkgs/by-name/la/lavalauncher/package.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/by-name/la/lavalauncher/package.nix b/pkgs/by-name/la/lavalauncher/package.nix index aaaae6de6b5c..e3c745f55740 100644 --- a/pkgs/by-name/la/lavalauncher/package.nix +++ b/pkgs/by-name/la/lavalauncher/package.nix @@ -45,6 +45,8 @@ stdenv.mkDerivation (finalAttrs: { wayland-protocols ]; + strictDeps = true; + meta = { homepage = "https://git.sr.ht/~leon_plickat/lavalauncher"; description = "Simple launcher panel for Wayland desktops"; From edfe07384d687f33e8caf05c7c070331d4d2ac1a Mon Sep 17 00:00:00 2001 From: Anderson Torres Date: Tue, 10 Sep 2024 09:17:11 -0300 Subject: [PATCH 5/5] lavalauncher: mark as broken for Darwin Mostly to fulfill the formalities, since (IIRC) it is not expected to run in Darwin. ```meson.build:52:23: ERROR: C shared or static library 'rt' not found``` https://logs.ofborg.org/?key=nixos/nixpkgs.340239&attempt_id=1f05cada-67d2-4cfe-b6a8-4bf4571b9375 --- pkgs/by-name/la/lavalauncher/package.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/by-name/la/lavalauncher/package.nix b/pkgs/by-name/la/lavalauncher/package.nix index e3c745f55740..a990d58eb4df 100644 --- a/pkgs/by-name/la/lavalauncher/package.nix +++ b/pkgs/by-name/la/lavalauncher/package.nix @@ -71,5 +71,8 @@ stdenv.mkDerivation (finalAttrs: { mainProgram = "lavalauncher"; maintainers = with lib.maintainers; [ AndersonTorres ]; inherit (wayland.meta) platforms; + # meson.build:52:23: ERROR: C shared or static library 'rt' not found + # https://logs.ofborg.org/?key=nixos/nixpkgs.340239&attempt_id=1f05cada-67d2-4cfe-b6a8-4bf4571b9375 + broken = stdenv.hostPlatform.isDarwin; }; })