diff --git a/hosts/common/programs/captree.nix b/hosts/common/programs/captree.nix index e5be22e2e..5309b72a4 100644 --- a/hosts/common/programs/captree.nix +++ b/hosts/common/programs/captree.nix @@ -1,7 +1,7 @@ { pkgs, ... }: { sane.programs.captree = { - packageUnwrapped = pkgs.linkBinIntoOwnPackage pkgs.libcap-with-captree "captree"; + packageUnwrapped = pkgs.linkBinIntoOwnPackage pkgs.libcap "captree"; sandbox.keepPidsAndProc = true; }; } diff --git a/pkgs/by-name/libcap-with-captree/package.nix b/pkgs/by-name/libcap-with-captree/package.nix deleted file mode 100644 index c17e248e6..000000000 --- a/pkgs/by-name/libcap-with-captree/package.nix +++ /dev/null @@ -1,22 +0,0 @@ -# libcap nix package should eventually ship `captree`, but until then, patch it. -# this is a re-implementation of an outstanding PR, but in a way that doesn't force mass-rebuilds: -# - -{ - libcap, - go, -}: libcap.overrideAttrs (base: { - depsBuildBuild = base.depsBuildBuild ++ [ go ]; - - makeFlags = base.makeFlags ++ [ - "GOLANG=yes" - ''GOCACHE=''${TMPDIR}/go-cache'' - "GOARCH=${go.GOARCH}" - "GOOS=${go.GOOS}" - ]; - - postPatch = base.postPatch + '' - # disable cross compilation for artifacts which are run as part of the build - substituteInPlace go/Makefile \ - --replace-fail '$(GO) run' 'GOOS= GOARCH= $(GO) run' - ''; -})