4 files changed, 1 insertions, 72 deletions
diff --git a/nixpkgs/pkgs/tools/archivers/unar/default.nix b/nixpkgs/pkgs/tools/archivers/unar/default.nix
index 4b2c66c0fc40..b1c818505712 100644
--- a/nixpkgs/pkgs/tools/archivers/unar/default.nix
+++ b/nixpkgs/pkgs/tools/archivers/unar/default.nix
@@ -50,12 +50,6 @@ stdenv.mkDerivation rec {
     lib.optionals stdenv.isLinux [ gnustep.make ] ++
     lib.optionals stdenv.isDarwin [ xcbuildHook ];
 
-  # Work around https://github.com/NixOS/nixpkgs/issues/166205.
-  # xcbuild links with clang instead of clang++.
-  env = lib.optionalAttrs stdenv.isDarwin {
-    LD_FLAGS = "-l${stdenv.cc.libcxx.cxxabi.libName}";
-  };
-
   xcbuildFlags = lib.optionals stdenv.isDarwin [
     "-target unar"
     "-target lsar"
diff --git a/nixpkgs/pkgs/tools/archivers/unrar/default.nix b/nixpkgs/pkgs/tools/archivers/unrar/default.nix
deleted file mode 100644
index 8b4f46088b2d..000000000000
--- a/nixpkgs/pkgs/tools/archivers/unrar/default.nix
+++ /dev/null
@@ -1,61 +0,0 @@
-{ lib
-, stdenv
-, fetchzip
-}:
-
-stdenv.mkDerivation (finalAttrs: {
-  pname = "unrar";
-  version = "6.2.12";
-
-  src = fetchzip {
-    url = "https://www.rarlab.com/rar/unrarsrc-${finalAttrs.version}.tar.gz";
-    stripRoot = false;
-    hash = "sha256-VAL3o9JGmkAcEssa/P/SL9nyxnigb7dX9YZBHrG9f0A=";
-  };
-
-  sourceRoot = finalAttrs.src.name;
-
-  postPatch = ''
-    substituteInPlace unrar/makefile \
-      --replace "CXX=" "#CXX=" \
-      --replace "STRIP=" "#STRIP=" \
-      --replace "AR=" "#AR="
-  '';
-
-  outputs = [ "out" "dev" ];
-
-  # `make {unrar,lib}` call `make clean` implicitly
-  # separate build into different dirs to avoid deleting them
-  buildPhase = ''
-    runHook preBuild
-
-    cp -a unrar libunrar
-    make -C libunrar lib
-    make -C unrar -j1
-
-    runHook postBuild
-  '';
-
-  installPhase = ''
-    runHook preInstall
-
-    install -Dm755 unrar/unrar -t $out/bin/
-    install -Dm644 unrar/{acknow.txt,license.txt} -t $out/share/doc/unrar/
-
-    install -Dm755 libunrar/libunrar.so -t $out/lib/
-    install -Dm644 libunrar/dll.hpp -t $dev/include/unrar/
-
-    runHook postInstall
-  '';
-
-  setupHook = ./setup-hook.sh;
-
-  meta = with lib; {
-    description = "Utility for RAR archives";
-    homepage = "https://www.rarlab.com/";
-    license = licenses.unfreeRedistributable;
-    mainProgram = "unrar";
-    maintainers = with maintainers; [ wegank ];
-    platforms = platforms.all;
-  };
-})
diff --git a/nixpkgs/pkgs/tools/archivers/unrar/setup-hook.sh b/nixpkgs/pkgs/tools/archivers/unrar/setup-hook.sh
deleted file mode 100644
index 41d6a5cd217b..000000000000
--- a/nixpkgs/pkgs/tools/archivers/unrar/setup-hook.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-unpackCmdHooks+=(_tryUnrar)
-_tryUnrar() {
-    if ! [[ "$curSrc" =~ \.rar$ ]]; then return 1; fi
-    unrar x "$curSrc" >/dev/null
-}
diff --git a/nixpkgs/pkgs/tools/archivers/zpaq/zpaqd.nix b/nixpkgs/pkgs/tools/archivers/zpaq/zpaqd.nix
index 6896897be3b1..07ef4db4d6b0 100644
--- a/nixpkgs/pkgs/tools/archivers/zpaq/zpaqd.nix
+++ b/nixpkgs/pkgs/tools/archivers/zpaq/zpaqd.nix
@@ -33,6 +33,7 @@ stdenv.mkDerivation rec {
 
   meta = with lib; {
     description = "ZPAQ archive (de)compressor and algorithm development tool";
+    mainProgram = "zpaqd";
     license = licenses.gpl3Plus;
     maintainers = with maintainers; [ raskin ];
     platforms = platforms.linux;