summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMario Rodas <marsam@users.noreply.github.com>2022-11-23 04:20:00 +0000
committergithub-actions[bot] <github-actions[bot]@users.noreply.github.com>2022-11-25 16:48:56 +0000
commitc783530ecf0a3fbeaed71a83facd66629bdc5068 (patch)
tree0c8807ea9ec14811b82e377c139009f03b234ff1
parentcomma: 1.3.0 -> 1.4.0 (diff)
downloadnixpkgs-c783530ecf0a3fbeaed71a83facd66629bdc5068.tar.gz
comma: use nix from environment
(cherry picked from commit 1ef34b5ae875a9bbb81bb6e1f12703b7d20fca22)
-rw-r--r--pkgs/tools/package-management/comma/default.nix10
1 files changed, 4 insertions, 6 deletions
diff --git a/pkgs/tools/package-management/comma/default.nix b/pkgs/tools/package-management/comma/default.nix
index 604c7fbd89b6..1e8bd0afd327 100644
--- a/pkgs/tools/package-management/comma/default.nix
+++ b/pkgs/tools/package-management/comma/default.nix
@@ -2,9 +2,8 @@
, fetchFromGitHub
, fzy
, lib
-, makeWrapper
-, nix
-, nix-index
+, makeBinaryWrapper
+, nix-index-unwrapped
, rustPlatform
, testers
}:
@@ -22,11 +21,11 @@ rustPlatform.buildRustPackage rec {
cargoHash = "sha256-/1b3GF0flhvejZ3C/yOzRGl50sWR4IxprwRoMUYEvm8=";
- nativeBuildInputs = [ makeWrapper ];
+ nativeBuildInputs = [ makeBinaryWrapper ];
postInstall = ''
wrapProgram $out/bin/comma \
- --prefix PATH : ${lib.makeBinPath [ nix fzy nix-index ]}
+ --prefix PATH : ${lib.makeBinPath [ fzy nix-index-unwrapped ]}
ln -s $out/bin/comma $out/bin/,
'';
@@ -39,6 +38,5 @@ rustPlatform.buildRustPackage rec {
description = "Runs programs without installing them";
license = licenses.mit;
maintainers = with maintainers; [ Enzime artturin ];
- platforms = platforms.all;
};
}