From 6b9f15e4b3e3d2ba9233847f173ee5725a8542bb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A1szl=C3=B3=20Kupcsik?= Date: Tue, 4 Mar 2025 23:54:30 +0100 Subject: [PATCH] rPackages.SharedObject: fix build Remove backport patches --- pkgs/development/r-modules/default.nix | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/pkgs/development/r-modules/default.nix b/pkgs/development/r-modules/default.nix index 615ddf5e866c..4a33fa79b441 100644 --- a/pkgs/development/r-modules/default.nix +++ b/pkgs/development/r-modules/default.nix @@ -1834,20 +1834,6 @@ let postPatch = "patchShebangs configure"; }); - SharedObject = old.SharedObject.overrideAttrs (attrs: { - # backport PR resolving build issues: https://github.com/Jiefei-Wang/SharedObject/pull/17 - patches = let inherit (pkgs) fetchpatch; in [ - (fetchpatch { - url = "https://github.com/Jiefei-Wang/SharedObject/pull/17/commits/50c4b2964649d7f5a14d843bd7089ab62650fcd3.patch"; - sha256 = "sha256-zn535IeOYRvyQ2yxgoGEq2wccrl9xdu9nREmy7sV+PQ="; - }) - (fetchpatch { - url = "https://github.com/Jiefei-Wang/SharedObject/pull/17/commits/bf096a39858e9210cbe246d4b136905d4cfbfaf4.patch"; - sha256 = "sha256-Z+BZOkFnLgIBiVuPsAHp7bMXzADcvuHV4hILdmLvd+k="; - }) - ]; - }); - httr2 = old.httr2.overrideAttrs (attrs: { preConfigure = "patchShebangs configure"; });