From cdc642f008fc06eeb6d51561a120c21330924819 Mon Sep 17 00:00:00 2001 From: midchildan Date: Sun, 28 Mar 2021 00:11:52 +0900 Subject: [PATCH] tmsu: add darwin build Additionally, - remove libfuse dependency TMSU doesn't depend on libfuse and instead uses go-fuse, a pure go reimplementation. - upgrade go-fuse The latest go-fuse release added support for recent versions of macFUSE. --- pkgs/tools/filesystems/tmsu/default.nix | 12 +++++++----- pkgs/tools/filesystems/tmsu/deps.nix | 4 ++-- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/pkgs/tools/filesystems/tmsu/default.nix b/pkgs/tools/filesystems/tmsu/default.nix index 1eac3e03ec92..aa3057202c74 100644 --- a/pkgs/tools/filesystems/tmsu/default.nix +++ b/pkgs/tools/filesystems/tmsu/default.nix @@ -1,4 +1,4 @@ -{ lib, buildGoPackage, fetchFromGitHub, fuse, installShellFiles }: +{ lib, buildGoPackage, fetchFromGitHub, installShellFiles }: buildGoPackage rec { pname = "tmsu"; @@ -14,7 +14,6 @@ buildGoPackage rec { goDeps = ./deps.nix; - buildInputs = [ fuse ]; nativeBuildInputs = [ installShellFiles ]; preBuild = '' @@ -24,7 +23,10 @@ buildGoPackage rec { ''; postInstall = '' - mv $out/bin/{TMSU,tmsu} + # can't do "mv TMSU tmsu" on case-insensitive filesystems + mv $out/bin/{TMSU,tmsu.tmp} + mv $out/bin/{tmsu.tmp,tmsu} + cp src/misc/bin/* $out/bin/ installManPage src/misc/man/tmsu.1 installShellCompletion --zsh src/misc/zsh/_tmsu @@ -34,7 +36,7 @@ buildGoPackage rec { homepage = "http://www.tmsu.org"; description = "A tool for tagging your files using a virtual filesystem"; maintainers = with maintainers; [ pSub ]; - license = licenses.gpl3; - platforms = platforms.linux; + license = licenses.gpl3Plus; + platforms = platforms.unix; }; } diff --git a/pkgs/tools/filesystems/tmsu/deps.nix b/pkgs/tools/filesystems/tmsu/deps.nix index 90e64b434c4a..7dee6324b672 100644 --- a/pkgs/tools/filesystems/tmsu/deps.nix +++ b/pkgs/tools/filesystems/tmsu/deps.nix @@ -5,8 +5,8 @@ fetch = { type = "git"; url = "https://github.com/hanwen/go-fuse"; - rev = "730713460d4fc41afdc2533bd37ff60c94c0c586"; - sha256 = "1y44d08fxyis99s6jxdr6dbbw5kv3wb8lkhq3xmr886i4w41lz03"; + rev = "0f728ba15b38579efefc3dc47821882ca18ffea7"; + sha256 = "05ymw2pp58avf19wvi0cgdzqf3d88k1jdf6ldj4hmhbkm3waqf7l"; }; } {