1 files changed, 8 insertions, 30 deletions
diff --git a/nixpkgs/pkgs/development/libraries/liburing/default.nix b/nixpkgs/pkgs/development/libraries/liburing/default.nix
index cfcf8ae3dd66..0f1757f4e618 100644
--- a/nixpkgs/pkgs/development/libraries/liburing/default.nix
+++ b/nixpkgs/pkgs/development/libraries/liburing/default.nix
@@ -1,45 +1,23 @@
-{ lib, stdenv, fetchgit
-, fetchpatch
-}:
+{ lib, stdenv, fetchgit }:
 
 stdenv.mkDerivation rec {
   pname = "liburing";
-  version = "2.3";
+  version = "2.4";
 
   src = fetchgit {
     url    = "http://git.kernel.dk/${pname}";
     rev    = "liburing-${version}";
-    sha256 = "sha256-vN6lLb5kpgHTKDxwibJPS61sdelILETVtJE2BYgp79k=";
+    sha256 = "sha256-vbe9uh9AqXyPkzwD6zHoHH3JMeAJEl2FSGzny1T7diM=";
   };
 
-  patches = [
-    # Backported portability fixes from liburing master, needed for pkgsMusl.liburing
-    ./0001-Add-custom-error-function-for-tests.patch
-    ./0002-test-Use-t_error-instead-of-glibc-s-error.patch
-    ./0003-examples-Use-t_error-instead-of-glibc-s-error.patch
-
-    # More portability fixes, in the process of being upstreamed
-    (fetchpatch {
-      url = "https://github.com/axboe/liburing/pull/798/commits/0fbcc44fe1fb2dc6807660b2cff1c2995add095b.patch";
-      hash = "sha256-xOMsw0VpYGst/+Isd2Tmq8CmBDK+uyLw3KNKPnsCSoA=";
-    })
-  ];
-
   separateDebugInfo = true;
   enableParallelBuilding = true;
   # Upstream's configure script is not autoconf generated, but a hand written one.
   setOutputFlags = false;
-  preConfigure =
-    # We cannot use configureFlags or configureFlagsArray directly, since we
-    # don't have structuredAttrs yet and using placeholder causes permissions
-    # denied errors. Using $dev / $man in configureFlags causes bash evaluation
-    # errors
-  ''
-    configureFlagsArray+=(
-      "--includedir=$dev/include"
-      "--mandir=$man/share/man"
-    )
-  '';
+  configureFlags = [
+    "--includedir=${placeholder "dev"}/include"
+    "--mandir=${placeholder "man"}/share/man"
+  ];
 
   # Doesn't recognize platform flags
   configurePlatforms = [];
@@ -61,6 +39,6 @@ stdenv.mkDerivation rec {
     homepage    = "https://git.kernel.dk/cgit/liburing/";
     license     = licenses.lgpl21;
     platforms   = platforms.linux;
-    maintainers = with maintainers; [ thoughtpolice ];
+    maintainers = with maintainers; [ thoughtpolice nickcao ];
   };
 }