diff options
author | Alyssa Ross <hi@alyssa.is> | 2023-10-20 22:09:03 +0000 |
---|---|---|
committer | Alyssa Ross <hi@alyssa.is> | 2023-10-20 22:09:03 +0000 |
commit | 50c21d167f7114fa1dbd95e5c4fb30eeb1a2d02e (patch) | |
tree | f2556b911180125ccbb7ed0e78a54e92da89adce /nixpkgs/pkgs/development/libraries/quarto | |
parent | 4c16d4548a98563c9d9ad76f4e5b2202864ccd54 (diff) | |
parent | cfc75eec4603c06503ae750f88cf397e00796ea8 (diff) | |
download | nixlib-50c21d167f7114fa1dbd95e5c4fb30eeb1a2d02e.tar nixlib-50c21d167f7114fa1dbd95e5c4fb30eeb1a2d02e.tar.gz nixlib-50c21d167f7114fa1dbd95e5c4fb30eeb1a2d02e.tar.bz2 nixlib-50c21d167f7114fa1dbd95e5c4fb30eeb1a2d02e.tar.lz nixlib-50c21d167f7114fa1dbd95e5c4fb30eeb1a2d02e.tar.xz nixlib-50c21d167f7114fa1dbd95e5c4fb30eeb1a2d02e.tar.zst nixlib-50c21d167f7114fa1dbd95e5c4fb30eeb1a2d02e.zip |
Merge commit 'cfc75eec4603c06503ae750f88cf397e00796ea8'
Conflicts: nixpkgs/pkgs/build-support/rust/build-rust-package/default.nix
Diffstat (limited to 'nixpkgs/pkgs/development/libraries/quarto')
-rw-r--r-- | nixpkgs/pkgs/development/libraries/quarto/default.nix | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/nixpkgs/pkgs/development/libraries/quarto/default.nix b/nixpkgs/pkgs/development/libraries/quarto/default.nix index e87243fe8ef0..47cfae648294 100644 --- a/nixpkgs/pkgs/development/libraries/quarto/default.nix +++ b/nixpkgs/pkgs/development/libraries/quarto/default.nix @@ -13,6 +13,7 @@ , python3 , quarto , extraPythonPackages ? ps: with ps; [] +, sysctl }: stdenv.mkDerivation (final: { @@ -60,11 +61,13 @@ stdenv.mkDerivation (final: { mv bin/* $out/bin mv share/* $out/share - runHook preInstall + runHook postInstall ''; passthru.tests = { - quarto-check = runCommand "quarto-check" {} '' + quarto-check = runCommand "quarto-check" { + nativeBuildInputs = lib.optionals stdenv.isDarwin [ sysctl ]; + } '' export HOME="$(mktemp -d)" ${quarto}/bin/quarto check touch $out @@ -81,7 +84,7 @@ stdenv.mkDerivation (final: { changelog = "https://github.com/quarto-dev/quarto-cli/releases/tag/v${version}"; license = licenses.gpl2Plus; maintainers = with maintainers; [ minijackson mrtarantoga ]; - platforms = [ "x86_64-linux" ]; + platforms = platforms.all; sourceProvenance = with sourceTypes; [ binaryNativeCode binaryBytecode ]; }; }) |