From 30bd9981144fa18acf456d8eef7f0b2a97ae901a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Aleix=20Bon=C3=A9?= Date: Tue, 3 Mar 2026 18:10:55 +0100 Subject: [PATCH] Re-enable nix-wrap libcap is no longer broken upstream --- overlay.nix | 4 +--- pkgs/nix-wrap/default.nix | 4 +--- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/overlay.nix b/overlay.nix index 0683b8b8..42a7ccb0 100644 --- a/overlay.nix +++ b/overlay.nix @@ -39,9 +39,7 @@ let nanos6Debug = final.nanos6.override { enableDebug = true; }; nixtools = callPackage ./pkgs/nixtools/default.nix { }; nixgen = callPackage ./pkgs/nixgen/default.nix { }; - # Broken because of pkgsStatic.libcap - # See: https://github.com/NixOS/nixpkgs/pull/268791 - #nix-wrap = callPackage ./pkgs/nix-wrap/default.nix { }; + nix-wrap = callPackage ./pkgs/nix-wrap/default.nix { }; nodes = callPackage ./pkgs/nodes/default.nix { }; nosv = callPackage ./pkgs/nosv/default.nix { }; openmp = callPackage ./pkgs/llvm-ompss2/openmp.nix { monorepoSrc = final.clangOmpss2Unwrapped.src; version = final.clangOmpss2Unwrapped.version; }; diff --git a/pkgs/nix-wrap/default.nix b/pkgs/nix-wrap/default.nix index 8d74a221..3f69ae96 100644 --- a/pkgs/nix-wrap/default.nix +++ b/pkgs/nix-wrap/default.nix @@ -14,7 +14,7 @@ let nixConfDir = "share"; nix_wrap_sh = writeText "nix-wrap.sh" '' #!/usr/bin/env bash - # + busybox_bin="${nixPrefix}${busybox}/bin" bubblewrap_bin="${nixPrefix}/${bubblewrap}/bin" @@ -69,7 +69,6 @@ stdenv.mkDerivation rec { name = "nix-wrap"; buildInputs = [ bashInteractive - busybox nix ]; src = null; @@ -92,7 +91,6 @@ stdenv.mkDerivation rec { homepage = null; description = "nix bubblewrap wrapper"; maintainers = [ ]; - broken = true; platforms = lib.platforms.linux; license = lib.licenses.mit; };