Loading pkgs/by-name/sa/saunafs/package.nix +4 −5 Original line number Diff line number Diff line Loading @@ -6,7 +6,7 @@ cmake, asciidoc, jemalloc, boost, boost186, fmt, fuse3, spdlog, Loading @@ -17,18 +17,17 @@ stdenv.mkDerivation (finalAttrs: { pname = "saunafs"; version = "4.6.0"; version = "4.7.0"; src = fetchFromGitHub { owner = "leil-io"; repo = "saunafs"; rev = "v${finalAttrs.version}"; hash = "sha256-uPHgyCL4/HYjoIm1Ev5p7lXAf1KlpV/OAqLVhu5Ang4="; hash = "sha256-6WXSnItbydH3Lk04l0Iph14EKzL/Pl5vriWdhHxTF6I="; }; patches = [ ./sfstool.patch ]; outputs = [ Loading @@ -46,7 +45,7 @@ stdenv.mkDerivation (finalAttrs: { spdlog yaml-cpp fuse3 boost boost186 jemalloc isa-l judy Loading pkgs/by-name/sa/saunafs/sfstool.patch +6 −7 Original line number Diff line number Diff line diff --git a/src/tools/sfstools.sh b/src/tools/sfstools.sh index c6c41197..9a59814f 100755 index ffd9ec22..a1cb83b6 100755 --- a/src/tools/sfstools.sh +++ b/src/tools/sfstools.sh @@ -1,5 +1,6 @@ @@ -1,4 +1,6 @@ #!/usr/bin/env bash -tool=$(basename $0) +tool="$(basename $0)" tool="$(basename $0)" -exec saunafs "${tool#sfs}" "$@" +dir="$(dirname $0)" -${tool/saunafs/saunafs } "$@" +$dir/saunafs ${tool/sfs/} "$@" + +exec "$dir/saunafs" "${tool#sfs}" "$@" Loading
pkgs/by-name/sa/saunafs/package.nix +4 −5 Original line number Diff line number Diff line Loading @@ -6,7 +6,7 @@ cmake, asciidoc, jemalloc, boost, boost186, fmt, fuse3, spdlog, Loading @@ -17,18 +17,17 @@ stdenv.mkDerivation (finalAttrs: { pname = "saunafs"; version = "4.6.0"; version = "4.7.0"; src = fetchFromGitHub { owner = "leil-io"; repo = "saunafs"; rev = "v${finalAttrs.version}"; hash = "sha256-uPHgyCL4/HYjoIm1Ev5p7lXAf1KlpV/OAqLVhu5Ang4="; hash = "sha256-6WXSnItbydH3Lk04l0Iph14EKzL/Pl5vriWdhHxTF6I="; }; patches = [ ./sfstool.patch ]; outputs = [ Loading @@ -46,7 +45,7 @@ stdenv.mkDerivation (finalAttrs: { spdlog yaml-cpp fuse3 boost boost186 jemalloc isa-l judy Loading
pkgs/by-name/sa/saunafs/sfstool.patch +6 −7 Original line number Diff line number Diff line diff --git a/src/tools/sfstools.sh b/src/tools/sfstools.sh index c6c41197..9a59814f 100755 index ffd9ec22..a1cb83b6 100755 --- a/src/tools/sfstools.sh +++ b/src/tools/sfstools.sh @@ -1,5 +1,6 @@ @@ -1,4 +1,6 @@ #!/usr/bin/env bash -tool=$(basename $0) +tool="$(basename $0)" tool="$(basename $0)" -exec saunafs "${tool#sfs}" "$@" +dir="$(dirname $0)" -${tool/saunafs/saunafs } "$@" +$dir/saunafs ${tool/sfs/} "$@" + +exec "$dir/saunafs" "${tool#sfs}" "$@"