diff options
author | Michael Weiss <dev.primeos@gmail.com> | 2020-01-24 18:29:38 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-01-24 18:29:38 +0100 |
commit | 7c08ba312b0b26835c26506b6b754613e658f5ba (patch) | |
tree | 88e8850084abd743b10660fc4bca86d3d009d54d /pkgs/tools | |
parent | 3791770384cf99d7b9909ba671b9d570382f7681 (diff) | |
parent | 983f39cdabc774f299e1ea0d75ee3475a55384cc (diff) | |
download | nixpkgs-7c08ba312b0b26835c26506b6b754613e658f5ba.tar nixpkgs-7c08ba312b0b26835c26506b6b754613e658f5ba.tar.gz nixpkgs-7c08ba312b0b26835c26506b6b754613e658f5ba.tar.bz2 nixpkgs-7c08ba312b0b26835c26506b6b754613e658f5ba.tar.lz nixpkgs-7c08ba312b0b26835c26506b6b754613e658f5ba.tar.xz nixpkgs-7c08ba312b0b26835c26506b6b754613e658f5ba.tar.zst nixpkgs-7c08ba312b0b26835c26506b6b754613e658f5ba.zip |
Merge pull request #78189 from kraem/master
rar2fs: init at 1.28.0
Diffstat (limited to 'pkgs/tools')
-rw-r--r-- | pkgs/tools/archivers/unrar/default.nix | 5 | ||||
-rw-r--r-- | pkgs/tools/filesystems/rar2fs/default.nix | 39 |
2 files changed, 43 insertions, 1 deletions
diff --git a/pkgs/tools/archivers/unrar/default.nix b/pkgs/tools/archivers/unrar/default.nix index 0fe8f2f5866..62fd02ac56d 100644 --- a/pkgs/tools/archivers/unrar/default.nix +++ b/pkgs/tools/archivers/unrar/default.nix @@ -22,6 +22,8 @@ stdenv.mkDerivation rec { make lib ''; + outputs = [ "out" "dev" ]; + installPhase = '' install -Dt "$out/bin" unrar @@ -30,7 +32,8 @@ stdenv.mkDerivation rec { $out/share/doc/unrar install -Dm755 libunrar.so $out/lib/libunrar.so - install -D dll.hpp $out/include/unrar/dll.hpp + + install -Dt $dev/include/unrar/ *.hpp ''; setupHook = ./setup-hook.sh; diff --git a/pkgs/tools/filesystems/rar2fs/default.nix b/pkgs/tools/filesystems/rar2fs/default.nix new file mode 100644 index 00000000000..996e3c52ec2 --- /dev/null +++ b/pkgs/tools/filesystems/rar2fs/default.nix @@ -0,0 +1,39 @@ +{ stdenv +, fetchFromGitHub +, autoreconfHook +, fuse +, unrar +}: + +stdenv.mkDerivation rec { + pname = "rar2fs"; + version = "1.28.0"; + + src = fetchFromGitHub { + owner = "hasse69"; + repo = pname; + rev = "v${version}"; + sha256 = "0fmdqrs5yvn89ngc26vj5ggnalpwrdm8pdcfszw1wflh78hvd8kb"; + }; + + postPatch = '' + substituteInPlace get-version.sh \ + --replace "which echo" "echo" + ''; + + nativeBuildInputs = [ autoreconfHook ]; + buildInputs = [ fuse unrar ]; + + configureFlags = [ + "--with-unrar=${unrar.dev}/include/unrar" + "--disable-static-unrar" + ]; + + meta = with stdenv.lib; { + description = "FUSE file system for reading RAR archives"; + homepage = https://hasse69.github.io/rar2fs/; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ kraem ]; + platforms = with platforms; linux ++ freebsd; + }; +} |