From 9c83a461e5789eb22c8a6f4c28f632e058cc8410 Mon Sep 17 00:00:00 2001 From: Connor Baker Date: Fri, 25 Mar 2022 11:55:52 -0400 Subject: [PATCH] ocamlPackages.z3: Remove unecessary patch Reported in https://github.com/Z3Prover/z3/issues/5776 and fixed in https://github.com/Z3Prover/z3/commit/4f6fcf8ea78492e1d90398bcd3a663f8517f2a66. --- pkgs/development/ocaml-modules/z3/default.nix | 5 ----- pkgs/development/ocaml-modules/z3/ocamlfind.patch | 13 ------------- 2 files changed, 18 deletions(-) delete mode 100644 pkgs/development/ocaml-modules/z3/ocamlfind.patch diff --git a/pkgs/development/ocaml-modules/z3/default.nix b/pkgs/development/ocaml-modules/z3/default.nix index b17f29b43531..35709b3105e3 100644 --- a/pkgs/development/ocaml-modules/z3/default.nix +++ b/pkgs/development/ocaml-modules/z3/default.nix @@ -7,11 +7,6 @@ else let z3-with-ocaml = (z3.override { ocamlBindings = true; inherit ocaml findlib zarith; -}).overrideAttrs (o: { - patches = (o.patches or []) ++ [ - # Fix build; see: https://github.com/Z3Prover/z3/issues/5776 - ./ocamlfind.patch - ]; }); in stdenv.mkDerivation { diff --git a/pkgs/development/ocaml-modules/z3/ocamlfind.patch b/pkgs/development/ocaml-modules/z3/ocamlfind.patch deleted file mode 100644 index d84907cf7938..000000000000 --- a/pkgs/development/ocaml-modules/z3/ocamlfind.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/scripts/mk_util.py b/scripts/mk_util.py -index 042e6af46..1e105b002 100644 ---- a/scripts/mk_util.py -+++ b/scripts/mk_util.py -@@ -1995,7 +1995,7 @@ class MLComponent(Component): - - LIBZ3 = LIBZ3 + ' ' + ' '.join(map(lambda x: '-cclib ' + x, LDFLAGS.split())) - -- stubs_install_path = '$$(%s printconf path)/stublibs' % OCAMLFIND -+ stubs_install_path = '$$(%s printconf destdir)/stublibs' % OCAMLFIND - if not STATIC_LIB: - loadpath = '-ccopt -L' + stubs_install_path - dllpath = '-dllpath ' + stubs_install_path