diff options
| author | K900 <me@0upti.me> | 2023-12-05 09:31:53 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-12-05 09:31:53 +0300 |
| commit | c5b3e8fa801f3adee9f9922b77d310ad8e2b30df (patch) | |
| tree | b26528ccf82af2b65ee6d67d1b25ec55086fc1e4 /pkgs/desktops | |
| parent | 07b6ba4ee3bcdf9298da201d9ff3dbadc9e8828c (diff) | |
| parent | 748ccc92a6f72c99258ce5b5bf464e79c6244710 (diff) | |
Merge pull request #269995 from mfenniak/bismuth-esbuild-bug
libsForQt5.bismuth: Fix generated JS
Diffstat (limited to 'pkgs/desktops')
| -rw-r--r-- | pkgs/desktops/plasma-5/3rdparty/addons/bismuth/0001-esbuild-config.patch | 13 | ||||
| -rw-r--r-- | pkgs/desktops/plasma-5/3rdparty/addons/bismuth/default.nix | 4 |
2 files changed, 17 insertions, 0 deletions
diff --git a/pkgs/desktops/plasma-5/3rdparty/addons/bismuth/0001-esbuild-config.patch b/pkgs/desktops/plasma-5/3rdparty/addons/bismuth/0001-esbuild-config.patch new file mode 100644 index 0000000000000..8ec7a34d97605 --- /dev/null +++ b/pkgs/desktops/plasma-5/3rdparty/addons/bismuth/0001-esbuild-config.patch @@ -0,0 +1,13 @@ +diff --git a/src/kwinscript/CMakeLists.txt b/src/kwinscript/CMakeLists.txt +index 9e2f7054..ed607027 100644 +--- a/src/kwinscript/CMakeLists.txt ++++ b/src/kwinscript/CMakeLists.txt +@@ -39,7 +39,7 @@ endif() + set(ESBUILD_COMMAND + "esbuild" "--bundle" "${CMAKE_CURRENT_SOURCE_DIR}/index.ts" + "--outfile=${CMAKE_CURRENT_BINARY_DIR}/bismuth/contents/code/index.mjs" +- "--format=esm" "--platform=neutral") ++ "--format=esm" "--platform=neutral" "--target=es6") + if(USE_NPM) + list(PREPEND ESBUILD_COMMAND "npx") + endif() diff --git a/pkgs/desktops/plasma-5/3rdparty/addons/bismuth/default.nix b/pkgs/desktops/plasma-5/3rdparty/addons/bismuth/default.nix index ee43f98fda207..ca54ff8887804 100644 --- a/pkgs/desktops/plasma-5/3rdparty/addons/bismuth/default.nix +++ b/pkgs/desktops/plasma-5/3rdparty/addons/bismuth/default.nix @@ -21,6 +21,10 @@ mkDerivation rec { sha256 = "sha256-c13OFEw6E/I8j/mqeLnuc9Chi6pc3+AgwAMPpCzh974="; }; + patches = [ + ./0001-esbuild-config.patch + ]; + cmakeFlags = [ "-DUSE_TSC=OFF" "-DUSE_NPM=OFF" |