jemalloc: don't try to patch 4.5.0

3 files changed, 10 insertions, 11 deletions

diff --git a/pkgs/development/libraries/jemalloc/common.nix b/pkgs/development/libraries/jemalloc/common.nix
index f4bd35ee56e..1a26bd13d41 100644
--- a/pkgs/development/libraries/jemalloc/common.nix
+++ b/pkgs/development/libraries/jemalloc/common.nix
@@ -1,6 +1,6 @@
-{ stdenv, fetchurl, fetchpatch, version, sha256 }:
+{ stdenv, fetchurl, version, sha256, ... }@args:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (rec {
   name = "jemalloc-${version}";
   inherit version;
 
@@ -19,11 +19,6 @@ stdenv.mkDerivation rec {
                    ++ stdenv.lib.optional stdenv.isArm "--disable-thp";
   doCheck = true;
 
-  patches = stdenv.lib.optional stdenv.isAarch64 (fetchpatch {
-    url = "https://patch-diff.githubusercontent.com/raw/jemalloc/jemalloc/pull/1035.patch";
-    sha256 = "02y0q3dp253bipxv4r954nqipbjbj92p6ww9bx5bk3d8pa81wkqq";
-  });
-
   enableParallelBuilding = true;
 
   meta = with stdenv.lib; {
@@ -37,4 +32,4 @@ stdenv.mkDerivation rec {
     platforms = platforms.all;
     maintainers = with maintainers; [ wkennington ];
   };
-}
+} // (builtins.removeAttrs args [ "stdenv" "fetchurl" "version" "sha256" ]))
diff --git a/pkgs/development/libraries/jemalloc/default.nix b/pkgs/development/libraries/jemalloc/default.nix
index c507eacbd00..40c06cbffdf 100644
--- a/pkgs/development/libraries/jemalloc/default.nix
+++ b/pkgs/development/libraries/jemalloc/default.nix
@@ -1,6 +1,10 @@
 { stdenv, fetchurl, fetchpatch }:
 import ./common.nix {
-  inherit stdenv fetchurl fetchpatch;
+  inherit stdenv fetchurl;
   version = "5.0.1";
   sha256 = "4814781d395b0ef093b21a08e8e6e0bd3dab8762f9935bbfb71679b0dea7c3e9";
+  patches = stdenv.lib.optional stdenv.isAarch64 (fetchpatch {
+    url = "https://patch-diff.githubusercontent.com/raw/jemalloc/jemalloc/pull/1035.patch";
+    sha256 = "02y0q3dp253bipxv4r954nqipbjbj92p6ww9bx5bk3d8pa81wkqq";
+  });
 }
diff --git a/pkgs/development/libraries/jemalloc/jemalloc450.nix b/pkgs/development/libraries/jemalloc/jemalloc450.nix
index a55270fcd02..00b38a85553 100644
--- a/pkgs/development/libraries/jemalloc/jemalloc450.nix
+++ b/pkgs/development/libraries/jemalloc/jemalloc450.nix
@@ -1,6 +1,6 @@
-{ stdenv, fetchurl, fetchpatch }:
+{ stdenv, fetchurl }:
 import ./common.nix {
-  inherit stdenv fetchurl fetchpatch;
+  inherit stdenv fetchurl;
   version = "4.5.0";
   sha256 = "10373xhpc10pgmai9fkc1z0rs029qlcb3c0qfnvkbwdlcibdh2cl";
 }