From 963874e2dbbe0f830da7d4b06bce91119c3c4bde Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Sat, 26 Mar 2022 00:00:49 +0800 Subject: [PATCH] crystal: remove pointless reference to crystal.lib (cherry picked from commit ba70ac13715900e0eb8f2f895369b9d0add5359e) --- .../compilers/crystal/build-package.nix | 22 +++++++++++++++++-- 1 file changed, 20 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/crystal/build-package.nix b/pkgs/development/compilers/crystal/build-package.nix index 2328e76ad770..4e0e8a193492 100644 --- a/pkgs/development/compilers/crystal/build-package.nix +++ b/pkgs/development/compilers/crystal/build-package.nix @@ -1,4 +1,15 @@ -{ stdenv, lib, crystal, shards, git, pkg-config, which, linkFarm, fetchFromGitHub, installShellFiles }: +{ stdenv +, lib +, crystal +, shards +, git +, pkg-config +, which +, linkFarm +, fetchFromGitHub +, installShellFiles +, removeReferencesTo +}: { # Some projects do not include a lock file, so you can pass one @@ -60,7 +71,13 @@ stdenv.mkDerivation (mkDerivationArgs // { buildInputs = args.buildInputs or [ ] ++ [ crystal ] ++ lib.optional (format != "crystal") shards; - nativeBuildInputs = args.nativeBuildInputs or [ ] ++ [ git installShellFiles pkg-config which ]; + nativeBuildInputs = args.nativeBuildInputs or [ ] ++ [ + git + installShellFiles + removeReferencesTo + pkg-config + which + ]; buildPhase = args.buildPhase or (lib.concatStringsSep "\n" ([ "runHook preBuild" @@ -102,6 +119,7 @@ stdenv.mkDerivation (mkDerivationArgs // { installManPage man/*.? fi '') ++ [ + "remove-references-to -t ${lib.getLib crystal} $out/bin/*" "runHook postInstall" ]));