From aca1e446e2d348c7e88aaf0dcb750d0a0d45c286 Mon Sep 17 00:00:00 2001 From: K900 Date: Tue, 11 Mar 2025 20:32:43 +0300 Subject: [PATCH] treewide: apply hack to packages that fail after GCC symlink changes --- pkgs/by-name/bo/bonmin/package.nix | 6 ++++++ pkgs/by-name/ec/eclib/package.nix | 7 +++++++ pkgs/by-name/gi/giac/package.nix | 6 ++++++ pkgs/desktops/mate/caja/default.nix | 6 ++++++ pkgs/development/libraries/gtk-sharp/3.0.nix | 6 ++++++ 5 files changed, 31 insertions(+) diff --git a/pkgs/by-name/bo/bonmin/package.nix b/pkgs/by-name/bo/bonmin/package.nix index 8104e34ad4bd..a38f3a6b4de5 100644 --- a/pkgs/by-name/bo/bonmin/package.nix +++ b/pkgs/by-name/bo/bonmin/package.nix @@ -57,6 +57,12 @@ stdenv.mkDerivation rec { "--with-asl-lib=-lipoptamplinterface -lamplsolver" ]; + # FIXME: ugly hack for https://github.com/NixOS/nixpkgs/pull/389009 + postConfigure = '' + substituteInPlace libtool \ + --replace 'for search_ext in .la $std_shrext .so .a' 'for search_ext in $std_shrext .so .a' + ''; + # Fix doc install. Should not be necessary after next release # ref https://github.com/coin-or/Bonmin/commit/4f665bc9e489a73cb867472be9aea518976ecd28 sourceRoot = "${src.name}/Bonmin"; diff --git a/pkgs/by-name/ec/eclib/package.nix b/pkgs/by-name/ec/eclib/package.nix index 8eb4a1f0bab0..17765450dd38 100644 --- a/pkgs/by-name/ec/eclib/package.nix +++ b/pkgs/by-name/ec/eclib/package.nix @@ -41,6 +41,13 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook ]; + + # FIXME: ugly hack for https://github.com/NixOS/nixpkgs/pull/389009 + postConfigure = '' + substituteInPlace libtool \ + --replace 'for search_ext in .la $std_shrext .so .a' 'for search_ext in $std_shrext .so .a' + ''; + doCheck = true; meta = with lib; { description = "Elliptic curve tools"; diff --git a/pkgs/by-name/gi/giac/package.nix b/pkgs/by-name/gi/giac/package.nix index cf218da403a0..0341f051d14a 100644 --- a/pkgs/by-name/gi/giac/package.nix +++ b/pkgs/by-name/gi/giac/package.nix @@ -106,6 +106,12 @@ stdenv.mkDerivation rec { substituteInPlace src/global.cc --replace 'browser="mozilla"' 'browser="xdg-open"' ''; + # FIXME: ugly hack for https://github.com/NixOS/nixpkgs/pull/389009 + postConfigure = '' + substituteInPlace libtool \ + --replace 'for search_ext in .la $std_shrext .so .a' 'for search_ext in $std_shrext .so .a' + ''; + nativeBuildInputs = [ autoreconfHook texliveSmall diff --git a/pkgs/desktops/mate/caja/default.nix b/pkgs/desktops/mate/caja/default.nix index b39f302274a3..4b2026436f4b 100644 --- a/pkgs/desktops/mate/caja/default.nix +++ b/pkgs/desktops/mate/caja/default.nix @@ -46,6 +46,12 @@ stdenv.mkDerivation rec { configureFlags = [ "--disable-update-mimedb" ]; + # FIXME: ugly hack for https://github.com/NixOS/nixpkgs/pull/389009 + postConfigure = '' + substituteInPlace libtool \ + --replace 'for search_ext in .la $std_shrext .so .a' 'for search_ext in $std_shrext .so .a' + ''; + enableParallelBuilding = true; passthru.updateScript = mateUpdateScript { inherit pname; }; diff --git a/pkgs/development/libraries/gtk-sharp/3.0.nix b/pkgs/development/libraries/gtk-sharp/3.0.nix index 89121db3b5d4..fed79a27f8d8 100644 --- a/pkgs/development/libraries/gtk-sharp/3.0.nix +++ b/pkgs/development/libraries/gtk-sharp/3.0.nix @@ -22,6 +22,12 @@ stdenv.mkDerivation rec { sha256 = "18n3l9zcldyvn4lwi8izd62307mkhz873039nl6awrv285qzah34"; }; + # FIXME: ugly hack for https://github.com/NixOS/nixpkgs/pull/389009 + postConfigure = '' + substituteInPlace libtool \ + --replace 'for search_ext in .la $std_shrext .so .a' 'for search_ext in $std_shrext .so .a' + ''; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ mono