Commit 1e9f0328 authored by Emily's avatar Emily
Browse files

llvmPackages_{14,15,16,17}.lldb: use SWIG 4 

The patches are already included in LLVM 16 and 17.
parent 0fe59d89

pkgs/development/compilers/llvm/common/default.nix

+28 −1
Original line number Diff line number Diff line
@@ -10,6 +10,7 @@ 
  substituteAll,

  fetchFromGitHub,

  fetchpatch,

  fetchpatch2,

  overrideCC,

  wrapCCWith,

  wrapBintoolsWith,
@@ -606,9 +607,35 @@ let 
                  (_: _: { name = "resource-dir.patch"; })

              ) { };

            in

            lib.optional (lib.versionOlder metadata.release_version "16")

            lib.optionals (lib.versionOlder metadata.release_version "15") [

              # Fixes for SWIG 4

              (fetchpatch2 {

                url = "https://github.com/llvm/llvm-project/commit/81fc5f7909a4ef5a8d4b5da2a10f77f7cb01ba63.patch?full_index=1";

                stripLen = 1;

                hash = "sha256-Znw+C0uEw7lGETQLKPBZV/Ymo2UigZS+Hv/j1mUo7p0=";

              })

              (fetchpatch2 {

                url = "https://github.com/llvm/llvm-project/commit/f0a25fe0b746f56295d5c02116ba28d2f965c175.patch?full_index=1";

                stripLen = 1;

                hash = "sha256-QzVeZzmc99xIMiO7n//b+RNAvmxghISKQD93U2zOgFI=";

              })

            ]

            ++ lib.optionals (lib.versionOlder metadata.release_version "16") [

              # Fixes for SWIG 4

              (fetchpatch2 {

                url = "https://github.com/llvm/llvm-project/commit/ba35c27ec9aa9807f5b4be2a0c33ca9b045accc7.patch?full_index=1";

                stripLen = 1;

                hash = "sha256-LXl+WbpmWZww5xMDrle3BM2Tw56v8k9LO1f1Z1/wDTs=";

              })

              (fetchpatch2 {

                url = "https://github.com/llvm/llvm-project/commit/9ec115978ea2bdfc60800cd3c21264341cdc8b0a.patch?full_index=1";

                stripLen = 1;

                hash = "sha256-u0zSejEjfrH3ZoMFm1j+NVv2t5AP9cE5yhsrdTS1dG4=";

              })



              # FIXME: do we need this after 15?

              (metadata.getVersionFile "lldb/procfs.patch")

            ]

            ++ lib.optional (lib.versionOlder metadata.release_version "17") resourceDirPatch

            ++ lib.optional (lib.versionOlder metadata.release_version "14") (

              metadata.getVersionFile "lldb/gnu-install-dirs.patch"

pkgs/development/compilers/llvm/common/lldb.nix

+1 −3
Original line number Diff line number Diff line
@@ -5,8 +5,7 @@ 
, cmake

, zlib

, ncurses

, swig3

, swig4

, swig

, which

, libedit

, libxml2
@@ -42,7 +41,6 @@ let 
    name = if lib.versionAtLeast release_version "18" then "lldb-dap" else "lldb-vscode";

    version = if lib.versionAtLeast release_version "18" then "0.2.0" else "0.1.0";

  };

  swig = if lib.versionAtLeast release_version "18" then swig4 else swig3;

in



stdenv.mkDerivation (rec {