Skip to content

Commit aca1e44

Browse files
committed
treewide: apply hack to packages that fail after GCC symlink changes
1 parent f6e560e commit aca1e44

File tree

5 files changed

+31
-0
lines changed

5 files changed

+31
-0
lines changed

pkgs/by-name/bo/bonmin/package.nix

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,12 @@ stdenv.mkDerivation rec {
5757
"--with-asl-lib=-lipoptamplinterface -lamplsolver"
5858
];
5959

60+
# FIXME: ugly hack for https://github.com/NixOS/nixpkgs/pull/389009
61+
postConfigure = ''
62+
substituteInPlace libtool \
63+
--replace 'for search_ext in .la $std_shrext .so .a' 'for search_ext in $std_shrext .so .a'
64+
'';
65+
6066
# Fix doc install. Should not be necessary after next release
6167
# ref https://github.com/coin-or/Bonmin/commit/4f665bc9e489a73cb867472be9aea518976ecd28
6268
sourceRoot = "${src.name}/Bonmin";

pkgs/by-name/ec/eclib/package.nix

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,13 @@ stdenv.mkDerivation rec {
4141
nativeBuildInputs = [
4242
autoreconfHook
4343
];
44+
45+
# FIXME: ugly hack for https://github.com/NixOS/nixpkgs/pull/389009
46+
postConfigure = ''
47+
substituteInPlace libtool \
48+
--replace 'for search_ext in .la $std_shrext .so .a' 'for search_ext in $std_shrext .so .a'
49+
'';
50+
4451
doCheck = true;
4552
meta = with lib; {
4653
description = "Elliptic curve tools";

pkgs/by-name/gi/giac/package.nix

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -106,6 +106,12 @@ stdenv.mkDerivation rec {
106106
substituteInPlace src/global.cc --replace 'browser="mozilla"' 'browser="xdg-open"'
107107
'';
108108

109+
# FIXME: ugly hack for https://github.com/NixOS/nixpkgs/pull/389009
110+
postConfigure = ''
111+
substituteInPlace libtool \
112+
--replace 'for search_ext in .la $std_shrext .so .a' 'for search_ext in $std_shrext .so .a'
113+
'';
114+
109115
nativeBuildInputs = [
110116
autoreconfHook
111117
texliveSmall

pkgs/desktops/mate/caja/default.nix

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,12 @@ stdenv.mkDerivation rec {
4646

4747
configureFlags = [ "--disable-update-mimedb" ];
4848

49+
# FIXME: ugly hack for https://github.com/NixOS/nixpkgs/pull/389009
50+
postConfigure = ''
51+
substituteInPlace libtool \
52+
--replace 'for search_ext in .la $std_shrext .so .a' 'for search_ext in $std_shrext .so .a'
53+
'';
54+
4955
enableParallelBuilding = true;
5056

5157
passthru.updateScript = mateUpdateScript { inherit pname; };

pkgs/development/libraries/gtk-sharp/3.0.nix

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,12 @@ stdenv.mkDerivation rec {
2222
sha256 = "18n3l9zcldyvn4lwi8izd62307mkhz873039nl6awrv285qzah34";
2323
};
2424

25+
# FIXME: ugly hack for https://github.com/NixOS/nixpkgs/pull/389009
26+
postConfigure = ''
27+
substituteInPlace libtool \
28+
--replace 'for search_ext in .la $std_shrext .so .a' 'for search_ext in $std_shrext .so .a'
29+
'';
30+
2531
nativeBuildInputs = [ pkg-config ];
2632
buildInputs = [
2733
mono

0 commit comments

Comments
 (0)