libsForQt5.bismuth: 2.1.0 -> 2.2.0 (#148673)
This commit is contained in:
parent
1421e6be62
commit
72000dced2
2 changed files with 5 additions and 41 deletions
|
@ -1,37 +0,0 @@
|
|||
From c9aaff2461daba31a25ed20c0789ffd7c3561887 Mon Sep 17 00:00:00 2001
|
||||
From: Pasquale <p3dimaria@hotmail.it>
|
||||
Date: Tue, 9 Nov 2021 23:12:50 +0100
|
||||
Subject: [PATCH] Avoid usage of npx
|
||||
|
||||
tsc is only used for checking type annotation
|
||||
that are stripped by esbuild
|
||||
|
||||
---
|
||||
src/kwinscript/CMakeLists.txt | 4 ++--
|
||||
1 file changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/src/kwinscript/CMakeLists.txt b/src/kwinscript/CMakeLists.txt
|
||||
index 6d85d5d..6f966a4 100644
|
||||
--- a/src/kwinscript/CMakeLists.txt
|
||||
+++ b/src/kwinscript/CMakeLists.txt
|
||||
@@ -29,7 +29,7 @@ add_custom_target(
|
||||
|
||||
add_custom_command(
|
||||
OUTPUT "bismuth/contents/code/index.mjs"
|
||||
- COMMAND "npx" "esbuild"
|
||||
+ COMMAND "esbuild"
|
||||
"--bundle" "${CMAKE_CURRENT_SOURCE_DIR}/index.ts"
|
||||
"--outfile=${CMAKE_CURRENT_BINARY_DIR}/bismuth/contents/code/index.mjs"
|
||||
"--format=esm"
|
||||
@@ -40,7 +40,7 @@ add_custom_command(
|
||||
|
||||
add_custom_target(
|
||||
LintViaTSC
|
||||
- COMMAND "npx" "tsc" "--noEmit" "--incremental"
|
||||
+ COMMAND "true"
|
||||
COMMENT "👮 Checking sources using TS Compiler..."
|
||||
)
|
||||
|
||||
--
|
||||
2.33.1
|
||||
|
|
@ -12,17 +12,18 @@
|
|||
|
||||
mkDerivation rec {
|
||||
pname = "bismuth";
|
||||
version = "2.1.0";
|
||||
version = "2.2.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Bismuth-Forge";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-ICpGgFvVi7tiYbMCo3JWQmbA36rdWF4NFYTWIejhxr4=";
|
||||
sha256 = "sha256-ntfLijYPaOHvQToiAxuBZ5ayHPyQyevP9l6++SL0vUw=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
./0001-Avoid-usage-of-npx.patch
|
||||
cmakeFlags = [
|
||||
"-DUSE_TSC=OFF"
|
||||
"-DUSE_NPM=OFF"
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
Loading…
Reference in a new issue