Merge pull request #172271 from Artturin/crystalbuildstrict

main
Artturi 2 years ago committed by GitHub
commit 197681059f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 7
      pkgs/development/compilers/crystal/build-package.nix
  2. 3
      pkgs/development/compilers/crystal/default.nix
  3. 3
      pkgs/development/tools/oq/default.nix
  4. 3
      pkgs/development/tools/scry/default.nix
  5. 3
      pkgs/tools/misc/kakoune-cr/default.nix

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

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

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

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

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

Loading…
Cancel
Save