summary refs log tree commit diff
diff options
context:
space:
mode:
authorMaximilian Bosch <maximilian@mbosch.me>2023-11-04 12:57:12 +0100
committerGitHub <noreply@github.com>2023-11-04 12:57:12 +0100
commitb4c0c733b32c8b1bbe3ae7f12544947f82986a87 (patch)
treeac745bdc539e804ed4674eecd6b8bb98a3af25df
parente181a9d005f8ac29ddc035a89f26c4cd89a639e0 (diff)
parent09f7789948ae6e73f294870e44b6fe21f42d08b2 (diff)
downloadnixpkgs-b4c0c733b32c8b1bbe3ae7f12544947f82986a87.tar
nixpkgs-b4c0c733b32c8b1bbe3ae7f12544947f82986a87.tar.gz
nixpkgs-b4c0c733b32c8b1bbe3ae7f12544947f82986a87.tar.bz2
nixpkgs-b4c0c733b32c8b1bbe3ae7f12544947f82986a87.tar.lz
nixpkgs-b4c0c733b32c8b1bbe3ae7f12544947f82986a87.tar.xz
nixpkgs-b4c0c733b32c8b1bbe3ae7f12544947f82986a87.tar.zst
nixpkgs-b4c0c733b32c8b1bbe3ae7f12544947f82986a87.zip
Merge pull request #263716 from Mic92/zfstools
zfstools: fix missing zpool in PATH
-rw-r--r--pkgs/tools/filesystems/zfstools/default.nix9
1 files changed, 5 insertions, 4 deletions
diff --git a/pkgs/tools/filesystems/zfstools/default.nix b/pkgs/tools/filesystems/zfstools/default.nix
index feb5b23df52..0a4447bacc4 100644
--- a/pkgs/tools/filesystems/zfstools/default.nix
+++ b/pkgs/tools/filesystems/zfstools/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, ruby, zfs }:
+{ lib, stdenv, fetchFromGitHub, ruby, zfs, makeWrapper }:
 
 stdenv.mkDerivation rec {
   pname = "zfstools";
@@ -12,6 +12,7 @@ stdenv.mkDerivation rec {
   };
 
   buildInputs = [ ruby ];
+  nativeBuildInputs = [ makeWrapper ];
 
   installPhase = ''
     mkdir -p $out/bin
@@ -20,10 +21,10 @@ stdenv.mkDerivation rec {
     cp -R lib $out/
 
     for f in $out/bin/*; do
-      substituteInPlace $f --replace "/usr/bin/env ruby" "ruby -I$out/lib"
+      wrapProgram $f \
+        --set RUBYLIB $out/lib \
+        --prefix PATH : ${zfs}/bin
     done
-
-    sed -e 's|cmd.*=.*"zfs |cmd = "${zfs}/sbin/zfs |g' -i $out/lib/zfstools/{dataset,snapshot}.rb
   '';
 
   meta = with lib; {