From 41eb407d2c77046ed0cc8c4beb246be25728ffb2 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Sun, 27 Feb 2022 18:33:00 +0100 Subject: [PATCH] Revert "jetbrains.jdk: fix build w/glibc-2.34" This reverts commit 4427e547ca418bac7cc2a6b4c5d144a4a2fac126. Patch is not needed anymore. --- pkgs/development/compilers/jetbrains-jdk/default.nix | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/pkgs/development/compilers/jetbrains-jdk/default.nix b/pkgs/development/compilers/jetbrains-jdk/default.nix index 2d76b98f580c..bfff07aabcb2 100644 --- a/pkgs/development/compilers/jetbrains-jdk/default.nix +++ b/pkgs/development/compilers/jetbrains-jdk/default.nix @@ -1,4 +1,4 @@ -{ lib, openjdk11, fetchFromGitHub, jetbrains, fetchpatch }: +{ lib, openjdk11, fetchFromGitHub, jetbrains }: openjdk11.overrideAttrs (oldAttrs: rec { pname = "jetbrains-jdk"; @@ -10,12 +10,7 @@ openjdk11.overrideAttrs (oldAttrs: rec { rev = "jb${version}"; sha256 = "sha256-TPNYZUkAoiZfp7Ci3fslKnRNGY1lnyIhXYUt6J31lwI="; }; - patches = [ - (fetchpatch { - url = "https://github.com/JetBrains/JetBrainsRuntime/commit/980cfdf8d04c015bf2ecb4642064e45e3f36630d.patch"; - sha256 = "sha256-/f20sWnlWoObgdgZKWD785q0aRZ5oIP5pzW+AmejLWM="; - }) - ]; + patches = []; meta = with lib; { description = "An OpenJDK fork to better support Jetbrains's products."; longDescription = ''