Merge branch 'master' into init-follow

NixOS · Sep 12, 2024 · 48e3d5d · 48e3d5d
2 parents 2da3873 + 80aafed
commit 48e3d5d
Showing 1 changed file with 9 additions and 6 deletions.
diff --git a/pkgs/development/compilers/gforth/swig.nix b/pkgs/development/compilers/gforth/swig.nix
@@ -1,16 +1,19 @@
-{ swig3, fetchFromGitHub }:
+{
+  swig,
+  pcre,
+  fetchFromGitHub,
+}:
 
 ## for updating to swig4, see
 ## https://github.com/GeraldWodni/swig/pull/6
-swig3.overrideDerivation (old: {
+(swig.overrideAttrs (old: {
   version = "3.0.9-forth";
   src = fetchFromGitHub {
     owner = "GeraldWodni";
     repo = "swig";
     rev = "a45b807e5f9d8ca1a43649c8265d2741a393862a";
     sha256 = "sha256-6nOOPFGFNaQInEkul0ZAh+ks9n3wqCQ6/tbduvG/To0=";
   };
-  configureFlags = old.configureFlags ++ [
-    "--enable-forth"
-  ];
-})
+  configureFlags = old.configureFlags ++ [ "--enable-forth" ];
+})).override
+  { pcre2 = pcre; }