nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-04-13 11:47:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #172271 from Artturin/crystalbuildstrict

Browse Source
This commit is contained in:
Artturi 2022-05-13 20:50:11 +03:00 committed by GitHub
commit 197681059f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pkgs/development/compilers/crystal/build-package.nix
View File

@ -72,16 +72,17 @@ stdenv.mkDerivation (mkDerivationArgs // {
PREFIX = placeholder "out";
buildInputs = args.buildInputs or [ ] ++ [ crystal ]
++ lib.optional (format != "crystal") shards;
strictDeps = true;
buildInputs = args.buildInputs or [ ] ++ [ crystal ];
nativeBuildInputs = args.nativeBuildInputs or [ ] ++ [
crystal
git
installShellFiles
removeReferencesTo
pkg-config
which
];
] ++ lib.optional (format != "crystal") shards;
buildPhase = args.buildPhase or (lib.concatStringsSep "\n" ([
"runHook preBuild"

3
pkgs/development/compilers/crystal/default.nix
View File

@ -145,9 +145,10 @@ let
export CRYSTAL_CACHE_DIR=$TMP
'';
buildInputs = commonBuildInputs extraBuildInputs;
strictDeps = true;
nativeBuildInputs = [ binary makeWrapper which pkg-config llvmPackages.llvm ];
buildInputs = commonBuildInputs extraBuildInputs;
makeFlags = [
"CRYSTAL_CONFIG_VERSION=${version}"

3
pkgs/development/tools/oq/default.nix
View File

@ -18,7 +18,8 @@ crystal.buildCrystalPackage rec {
};
nativeBuildInputs = [ makeWrapper ];
buildInputs = [ jq libxml2 ];
buildInputs = [ libxml2 ];
checkInputs = [ jq ];
format = "shards";

3
pkgs/development/tools/scry/default.nix
View File

@ -1,4 +1,4 @@
{ lib, fetchFromGitHub, crystal, coreutils, makeWrapper }:
{ lib, fetchFromGitHub, crystal, coreutils, makeWrapper, bash }:
crystal.buildCrystalPackage rec {
pname = "scry";
@ -19,6 +19,7 @@ crystal.buildCrystalPackage rec {
format = "shards";
nativeBuildInputs = [ makeWrapper ];
buildInputs = [ bash ];
shardsFile = ./shards.nix;

3
pkgs/tools/misc/kakoune-cr/default.nix
View File

@ -1,4 +1,4 @@
{ lib, crystal, fetchFromGitHub, fetchurl, jq }:
{ lib, crystal, fetchFromGitHub, fetchurl, jq, bash }:
let
icon = fetchurl {
url = "https://github.com/mawww/kakoune/raw/master/doc/kakoune_logo.svg";
@ -16,6 +16,7 @@ crystal.buildCrystalPackage rec {
hash = "sha256-xFrxbnZl/49vGKdkESPa6LpK0ckq4Jv5GNLL/G0qA1w=";
};
buildInputs = [ bash ];
propagatedUserEnvPkgs = [ jq ];
format = "shards";