git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #145196 from pasqui23/bismuth
commitfa7abc63d9e2898ef99e5b934b005bb7732b0fc9 authorSandro <sandro.jaeckel@gmail.com> dateThu 11 Nov 2021, 13:25 (5 years ago) parentd73feafed256b9
3 files changed+86
compare with master
unifiedsplit
pkgs/desktops/plasma-5/3rdparty/addons/bismuth/0001-Avoid-usage-of-npx.patch+37 pkgs/desktops/plasma-5/3rdparty/addons/bismuth/default.nix+48 pkgs/desktops/plasma-5/default.nix+1
pkgs/desktops/plasma-5/3rdparty/addons/bismuth/0001-Avoid-usage-of-npx.patchnew file+37
@@ -0,0 +1,37 @@
1+From c9aaff2461daba31a25ed20c0789ffd7c3561887 Mon Sep 17 00:00:00 2001
2+From: Pasquale <p3dimaria@hotmail.it>
3+Date: Tue, 9 Nov 2021 23:12:50 +0100
4+Subject: [PATCH] Avoid usage of npx
5+
6+tsc is only used for checking type annotation
7+that are stripped by esbuild
8+
9+---
10+ src/kwinscript/CMakeLists.txt | 4 ++--
11+ 1 file changed, 2 insertions(+), 2 deletions(-)
12+
13+diff --git a/src/kwinscript/CMakeLists.txt b/src/kwinscript/CMakeLists.txt
14+index 6d85d5d..6f966a4 100644
15+--- a/src/kwinscript/CMakeLists.txt
16++++ b/src/kwinscript/CMakeLists.txt
17+@@ -29,7 +29,7 @@ add_custom_target(
18+
19+ add_custom_command(
20+ OUTPUT "bismuth/contents/code/index.mjs"
21+- COMMAND "npx" "esbuild"
22++ COMMAND "esbuild"
23+ "--bundle" "${CMAKE_CURRENT_SOURCE_DIR}/index.ts"
24+ "--outfile=${CMAKE_CURRENT_BINARY_DIR}/bismuth/contents/code/index.mjs"
25+ "--format=esm"
26+@@ -40,7 +40,7 @@ add_custom_command(
27+
28+ add_custom_target(
29+ LintViaTSC
30+- COMMAND "npx" "tsc" "--noEmit" "--incremental"
31++ COMMAND "true"
32+ COMMENT "👮 Checking sources using TS Compiler..."
33+ )
34+
35+--
36+2.33.1
37+
pkgs/desktops/plasma-5/3rdparty/addons/bismuth/default.nixnew file+48
@@ -0,0 +1,48 @@
1+{ lib
2+, mkDerivation
3+, fetchFromGitHub
4+, kcoreaddons
5+, kwindowsystem
6+, plasma-framework
7+, systemsettings
8+, cmake
9+, extra-cmake-modules
10+, esbuild
11+}:
12+
13+mkDerivation rec {
14+ pname = "bismuth";
15+ version = "2.1.0";
16+
17+ src = fetchFromGitHub {
18+ owner = "Bismuth-Forge";
19+ repo = pname;
20+ rev = "v${version}";
21+ sha256 = "sha256-ICpGgFvVi7tiYbMCo3JWQmbA36rdWF4NFYTWIejhxr4=";
22+ };
23+
24+ patches = [
25+ ./0001-Avoid-usage-of-npx.patch
26+ ];
27+
28+ nativeBuildInputs = [
29+ cmake
30+ extra-cmake-modules
31+ esbuild
32+ ];
33+
34+ buildInputs = [
35+ kcoreaddons
36+ kwindowsystem
37+ plasma-framework
38+ systemsettings
39+ ];
40+
41+ meta = with lib; {
42+ description = "A dynamic tiling extension for KWin";
43+ license = licenses.mit;
44+ maintainers = with maintainers; [ pasqui23 ];
45+ homepage = "https://bismuth-forge.github.io/bismuth/";
46+ inherit (kwindowsystem.meta) platforms;
47+ };
48+}
pkgs/desktops/plasma-5/default.nix+1
@@ -155,6 +155,7 @@ let
155155 thirdParty = let inherit (libsForQt5) callPackage; in {
156156 plasma-applet-caffeine-plus = callPackage ./3rdparty/addons/caffeine-plus.nix { };
157157 plasma-applet-virtual-desktop-bar = callPackage ./3rdparty/addons/virtual-desktop-bar.nix { };
158+ bismuth = callPackage ./3rdparty/addons/bismuth { };
158159 kwin-dynamic-workspaces = callPackage ./3rdparty/kwin/scripts/dynamic-workspaces.nix { };
159160 kwin-tiling = callPackage ./3rdparty/kwin/scripts/tiling.nix { };
160161 krohnkite = callPackage ./3rdparty/kwin/scripts/krohnkite.nix { };