From 889e2ca41f944b4b7961ff6f057baa8d7061b09d Mon Sep 17 00:00:00 2001
From: ryneeverett <ryneeverett@gmail.com>
Date: Sun, 9 Nov 2025 00:31:02 -0500
Subject: [PATCH] orjail: remove

Maintainer @onny gave the thumbs up to the suggestion of removing since
the project seems unmaintained and the build is broken on the latest
firejail release: https://github.com/NixOS/nixpkgs/pull/429616#issuecomment-3254177901
---
 .../manual/release-notes/rl-2511.section.md   |  2 +
 pkgs/by-name/or/orjail/package.nix            | 57 -------------------
 2 files changed, 2 insertions(+), 57 deletions(-)
 delete mode 100644 pkgs/by-name/or/orjail/package.nix

diff --git a/nixos/doc/manual/release-notes/rl-2511.section.md b/nixos/doc/manual/release-notes/rl-2511.section.md
index 65001eb9b172..96659c6cbdd0 100644
--- a/nixos/doc/manual/release-notes/rl-2511.section.md
+++ b/nixos/doc/manual/release-notes/rl-2511.section.md
@@ -281,6 +281,8 @@
 
 - `services.quorum` has been removed as the `quorum` package was broken and abandoned upstream.
 
+- `orjail` package has been removed as it is broken by the latest firejail release and seems unmaintained.
+
 - `teleport` has been upgraded from major version 17 to major version 18.
 Refer to [upstream upgrade instructions](https://goteleport.com/docs/upgrading/overview/)
 and [release notes for v18](https://goteleport.com/docs/changelog/#1800-070325).
diff --git a/pkgs/by-name/or/orjail/package.nix b/pkgs/by-name/or/orjail/package.nix
deleted file mode 100644
index 52e189b131d4..000000000000
--- a/pkgs/by-name/or/orjail/package.nix
+++ /dev/null
@@ -1,57 +0,0 @@
-{
-  lib,
-  stdenv,
-  fetchFromGitHub,
-  tor,
-  firejail,
-  iptables,
-  makeWrapper,
-}:
-
-stdenv.mkDerivation rec {
-  pname = "orjail";
-  version = "1.1";
-
-  src = fetchFromGitHub {
-    owner = "orjail";
-    repo = "orjail";
-    rev = "v${version}";
-    sha256 = "06bwqb3l7syy4c1d8xynxwakmdxvm3qfm8r834nidsknvpdckd9z";
-  };
-
-  nativeBuildInputs = [ makeWrapper ];
-
-  postPatch = ''
-    patchShebangs make-helper.bsh
-    mkdir bin
-    mv usr/sbin/orjail bin/orjail
-    rm -r usr
-  '';
-
-  makeFlags = [
-    "DESTDIR=${placeholder "out"}"
-  ];
-
-  postInstall = ''
-    # Specify binary paths: tor, firejail, iptables
-    # mktemp fails with /tmp path prefix, will work without it anyway
-    # https://github.com/orjail/orjail/issues/78
-    # firejail will fail reading /etc/hosts, therefore remove --hostname arg
-    # https://github.com/netblue30/firejail/issues/2758
-    substituteInPlace $out/bin/orjail \
-      --replace ''$'TORBIN=\n' ''$'TORBIN=${tor}/bin/tor\n' \
-      --replace ''$'FIREJAILBIN=\n' ''$'FIREJAILBIN=${firejail}/bin/firejail\n' \
-      --replace 'iptables -' '${iptables}/bin/iptables -' \
-      --replace 'mktemp /tmp/' 'mktemp ' \
-      --replace '--hostname=host ' ""
-  '';
-
-  meta = with lib; {
-    description = "Force programs to exclusively use tor network";
-    mainProgram = "orjail";
-    homepage = "https://github.com/orjail/orjail";
-    license = licenses.wtfpl;
-    maintainers = with maintainers; [ onny ];
-    platforms = platforms.linux;
-  };
-}