pyrox.dev
Merge pull request #278027 from strager/quick-lint-js-3.0.0
quick-lint-js: 2.19.0 -> 3.0.0
-32
pkgs/development/tools/quick-lint-js/build-tools-install.patch
-32
pkgs/development/tools/quick-lint-js/build-tools-install.patch
···
1
-
From 3923f0df76d24b73d57f15eec61ab190ea048093 Mon Sep 17 00:00:00 2001
2
-
From: "Matthew \"strager\" Glazar" <strager.nds@gmail.com>
3
-
Date: Thu, 26 Oct 2023 18:08:30 -0400
4
-
Subject: [PATCH] fix(build): fix installing build tools for cross-compilation
5
-
6
-
'cmake --install . --component build-tools' copies no files [1]. This
7
-
was caused by commit 1f2e1a47 where the code calling install() became
8
-
dead code on accident. Call install() so that 'cmake --install' copies
9
-
the build artifacts as intended.
10
-
11
-
[1] https://github.com/quick-lint/quick-lint-js/issues/1099
12
-
13
-
Refs: 1f2e1a4701793cac24eaac44d7af81a8b820b1bc
14
-
---
15
-
docs/CHANGELOG.md | 7 +++++++
16
-
tools/CMakeLists.txt | 1 -
17
-
2 files changed, 7 insertions(+), 1 deletion(-)
18
-
19
-
(docs/CHANGELOG.md changes omitted to reduce conflicts.)
20
-
21
-
diff --git a/tools/CMakeLists.txt b/tools/CMakeLists.txt
22
-
index 71ccbdf1b..b541afb52 100644
23
-
--- a/tools/CMakeLists.txt
24
-
+++ b/tools/CMakeLists.txt
25
-
@@ -68,7 +68,6 @@ if (QUICK_LINT_JS_ENABLE_BUILD_TOOLS)
26
-
COMMENT "Building all quick-lint-js build-time tools"
27
-
DEPENDS ${QUICK_LINT_JS_BUILD_TOOL_TARGETS}
28
-
)
29
-
-elseif (QUICK_LINT_JS_ENABLE_BUILD_TOOLS)
30
-
install(
31
-
TARGETS ${QUICK_LINT_JS_BUILD_TOOL_TARGETS}
32
-
COMPONENT build-tools
+2
-4
pkgs/development/tools/quick-lint-js/default.nix
+2
-4
pkgs/development/tools/quick-lint-js/default.nix
···
1
1
{ buildPackages, cmake, fetchFromGitHub, lib, ninja, stdenv, testers, quick-lint-js }:
2
2
3
3
let
4
-
version = "2.17.0";
4
+
version = "3.0.0";
5
5
6
6
src = fetchFromGitHub {
7
7
owner = "quick-lint";
8
8
repo = "quick-lint-js";
9
9
rev = version;
10
-
sha256 = "sha256-5+Cyw1cLgBkTePNNFoNAF2oHnLQDHr4vHiaZHJrewug=";
10
+
hash = "sha256-7apzP37GK5ZbCxcWfjK1ID6sYa24uoS1GUH3CBDmcRA=";
11
11
};
12
12
13
13
quick-lint-js-build-tools = buildPackages.stdenv.mkDerivation {
14
14
pname = "quick-lint-js-build-tools";
15
15
inherit version src;
16
-
17
-
patches = [ ./build-tools-install.patch ];
18
16
19
17
nativeBuildInputs = [ cmake ninja ];
20
18
doCheck = false;