gador/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #224306 from strager/quick-lint-js-cross

Browse Source 
quick-lint-js: support cross compiling
This commit is contained in:
Artturi
2023-11-20 09:12:48 +02:00
committed by GitHub
parent 4a41c902d2 6daf525c9d
commit 7bea2d350e
2 changed files with 69 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/development/tools/quick-lint-js/build-tools-install.patch
+32
View File
@@ -0,0 +1,32 @@
From 3923f0df76d24b73d57f15eec61ab190ea048093 Mon Sep 17 00:00:00 2001
From: "Matthew \"strager\" Glazar" <strager.nds@gmail.com>
Date: Thu, 26 Oct 2023 18:08:30 -0400
Subject: [PATCH] fix(build): fix installing build tools for cross-compilation
'cmake --install . --component build-tools' copies no files [1]. This
was caused by commit 1f2e1a47 where the code calling install() became
dead code on accident. Call install() so that 'cmake --install' copies
the build artifacts as intended.
[1] https://github.com/quick-lint/quick-lint-js/issues/1099
Refs: 1f2e1a4701793cac24eaac44d7af81a8b820b1bc
---
docs/CHANGELOG.md | 7 +++++++
tools/CMakeLists.txt | 1 -
2 files changed, 7 insertions(+), 1 deletion(-)
(docs/CHANGELOG.md changes omitted to reduce conflicts.)
diff --git a/tools/CMakeLists.txt b/tools/CMakeLists.txt
index 71ccbdf1b..b541afb52 100644
--- a/tools/CMakeLists.txt
+++ b/tools/CMakeLists.txt
@@ -68,7 +68,6 @@ if (QUICK_LINT_JS_ENABLE_BUILD_TOOLS)
COMMENT "Building all quick-lint-js build-time tools"
DEPENDS ${QUICK_LINT_JS_BUILD_TOOL_TARGETS}
)
-elseif (QUICK_LINT_JS_ENABLE_BUILD_TOOLS)
install(
TARGETS ${QUICK_LINT_JS_BUILD_TOOL_TARGETS}
COMPONENT build-tools
pkgs/development/tools/quick-lint-js/default.nix
+37 -6
View File
@@ -1,8 +1,6 @@
{ cmake, fetchFromGitHub, lib, ninja, stdenv, testers, quick-lint-js }:
{ buildPackages, cmake, fetchFromGitHub, lib, ninja, stdenv, testers, quick-lint-js }:
stdenv.mkDerivation rec {
pname = "quick-lint-js";
let
version = "2.17.0";
src = fetchFromGitHub {
@@ -12,11 +10,41 @@ stdenv.mkDerivation rec {
sha256 = "sha256-5+Cyw1cLgBkTePNNFoNAF2oHnLQDHr4vHiaZHJrewug=";
};
quick-lint-js-build-tools = buildPackages.stdenv.mkDerivation {
pname = "quick-lint-js-build-tools";
inherit version src;
patches = [ ./build-tools-install.patch ];
nativeBuildInputs = [ cmake ninja ];
doCheck = false;
cmakeFlags = [
"-DQUICK_LINT_JS_ENABLE_BUILD_TOOLS=ON"
# Temporary workaround for https://github.com/NixOS/nixpkgs/pull/108496#issuecomment-1192083379
"-DCMAKE_SKIP_BUILD_RPATH=ON"
];
ninjaFlags = "quick-lint-js-build-tools";
installPhase = ''
runHook preInstall
cmake --install . --component build-tools
runHook postInstall
'';
};
in
stdenv.mkDerivation rec {
pname = "quick-lint-js";
inherit version src;
nativeBuildInputs = [ cmake ninja ];
doCheck = true;
# Temporary workaround for https://github.com/NixOS/nixpkgs/pull/108496#issuecomment-1192083379
cmakeFlags = [ "-DCMAKE_SKIP_BUILD_RPATH=ON" ];
cmakeFlags = [
"-DQUICK_LINT_JS_USE_BUILD_TOOLS=${quick-lint-js-build-tools}/bin"
# Temporary workaround for https://github.com/NixOS/nixpkgs/pull/108496#issuecomment-1192083379
"-DCMAKE_SKIP_BUILD_RPATH=ON"
];
passthru.tests = {
version = testers.testVersion { package = quick-lint-js; };
@@ -29,4 +57,7 @@ stdenv.mkDerivation rec {
maintainers = with maintainers; [ ratsclub ];
platforms = platforms.all;
};
# Expose quick-lint-js-build-tools to nix repl as quick-lint-js.build-tools.
passthru.build-tools = quick-lint-js-build-tools;
}