From f170f48b6084274f6bc80619778878d1d0cd6a1f Mon Sep 17 00:00:00 2001
From: Emery Hemingway <ehmry@posteo.net>
Date: Fri, 16 Jun 2023 11:30:32 +0100
Subject: [PATCH] Update to Nixpkgs 23.05

- Patchelf 0.13.0 -> 0.13.1
---
 flake.nix                    |  2 +-
 overlay/default.nix          |  5 ++---
 overlay/patchelf/rpath.patch | 19 -------------------
 3 files changed, 3 insertions(+), 23 deletions(-)
 delete mode 100644 overlay/patchelf/rpath.patch

diff --git a/flake.nix b/flake.nix
index a90b569..62fb685 100644
--- a/flake.nix
+++ b/flake.nix
@@ -7,7 +7,7 @@
       inputs.nixpkgs.follows = "nixpkgs";
     };
     nimble.follows = "eris/nimble";
-    nixpkgs.url = "github:ehmry/nixpkgs/sigil-21.11";
+    nixpkgs.url = "github:ehmry/nixpkgs/sigil-23.05";
   };
 
   nixConfig = {
diff --git a/overlay/default.nix b/overlay/default.nix
index b6a2398..2b9e13c 100644
--- a/overlay/default.nix
+++ b/overlay/default.nix
@@ -82,12 +82,11 @@ in nullPkgs // {
 
   erisPatchHook =
     final.buildPackages.nimPackages.callPackage ./eris-patch-hook {
-      patchelf = prev.patchelf.overrideAttrs (attrs: {
-        patches = attrs.patches or [ ] ++ [
+      patchelf = prev.patchelf_0_13.overrideAttrs ({ patches ? [], ... }: {
+        patches = patches ++ [
           ./patchelf/dynstr.patch
           ./patchelf/shiftFile.patch
           ./patchelf/disable-assert.patch
-          ./patchelf/rpath.patch
         ];
       });
     };
diff --git a/overlay/patchelf/rpath.patch b/overlay/patchelf/rpath.patch
deleted file mode 100644
index 91dd20f..0000000
--- a/overlay/patchelf/rpath.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-commit 32003f90f7eb0d685913cf49a05f32f3125855b0
-Author: Emery Hemingway <ehmry@posteo.net>
-Date:   2022-05-18 20:17:03 -0500
-
-    Fix replacement of empty rpath with an empty rpath
-
-diff --git a/src/patchelf.cc b/src/patchelf.cc
-index fd1e7b7..b9f58cd 100644
---- a/src/patchelf.cc
-+++ b/src/patchelf.cc
-@@ -1426,7 +1426,7 @@ void ElfFile<ElfFileParamNames>::modifyRPath(RPathOp op,
- 
- 
-     if (newRPath.size() <= rpathSize) {
--        strcpy(rpath, newRPath.c_str());
-+        if (rpath) strcpy(rpath, newRPath.c_str());
-         return;
-     }
-