From ee5b4994c0fc6f5e02e7945a91a563a8232388f2 Mon Sep 17 00:00:00 2001 From: Luke Granger-Brown Date: Tue, 22 Jun 2021 20:29:28 +0000 Subject: [PATCH] 3p/nixpkgs/patches: remove various --- third_party/nixpkgs/patches/series | 1 - third_party/nixpkgs/patches/various.patch | 12 ------------ 2 files changed, 13 deletions(-) delete mode 100644 third_party/nixpkgs/patches/various.patch diff --git a/third_party/nixpkgs/patches/series b/third_party/nixpkgs/patches/series index 9e98ebae86..324117f1f0 100644 --- a/third_party/nixpkgs/patches/series +++ b/third_party/nixpkgs/patches/series @@ -1,3 +1,2 @@ -various.patch patch-cherrypy.patch pomerium-fix.patch diff --git a/third_party/nixpkgs/patches/various.patch b/third_party/nixpkgs/patches/various.patch deleted file mode 100644 index f7e0a61626..0000000000 --- a/third_party/nixpkgs/patches/various.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/pkgs/build-support/build-bazel-package/default.nix b/pkgs/build-support/build-bazel-package/default.nix ---- a/pkgs/build-support/build-bazel-package/default.nix -+++ b/pkgs/build-support/build-bazel-package/default.nix -@@ -126,7 +126,7 @@ in stdenv.mkDerivation (fBuildAttrs // { - find $bazelOut/external -maxdepth 1 -type l | while read symlink; do - name="$(basename "$symlink")" - rm "$symlink" -- test -f "$bazelOut/external/@$name.marker" && rm "$bazelOut/external/@$name.marker" -+ test -f "$bazelOut/external/@$name.marker" && rm "$bazelOut/external/@$name.marker" || true - done - - # Patching symlinks to remove build directory reference