mirror of
https://github.com/NixOS/nixpkgs.git
synced 2025-06-11 12:15:34 +03:00
Revert "treewide: apply hack to packages that fail after GCC symlink changes"
This reverts commit aca1e446e2
.
This commit is contained in:
parent
cfb15c6520
commit
4e29b6dcac
5 changed files with 0 additions and 31 deletions
|
@ -57,12 +57,6 @@ stdenv.mkDerivation rec {
|
||||||
"--with-asl-lib=-lipoptamplinterface -lamplsolver"
|
"--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
|
# Fix doc install. Should not be necessary after next release
|
||||||
# ref https://github.com/coin-or/Bonmin/commit/4f665bc9e489a73cb867472be9aea518976ecd28
|
# ref https://github.com/coin-or/Bonmin/commit/4f665bc9e489a73cb867472be9aea518976ecd28
|
||||||
sourceRoot = "${src.name}/Bonmin";
|
sourceRoot = "${src.name}/Bonmin";
|
||||||
|
|
|
@ -41,13 +41,6 @@ stdenv.mkDerivation rec {
|
||||||
nativeBuildInputs = [
|
nativeBuildInputs = [
|
||||||
autoreconfHook
|
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;
|
doCheck = true;
|
||||||
meta = with lib; {
|
meta = with lib; {
|
||||||
description = "Elliptic curve tools";
|
description = "Elliptic curve tools";
|
||||||
|
|
|
@ -106,12 +106,6 @@ stdenv.mkDerivation rec {
|
||||||
substituteInPlace src/global.cc --replace 'browser="mozilla"' 'browser="xdg-open"'
|
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 = [
|
nativeBuildInputs = [
|
||||||
autoreconfHook
|
autoreconfHook
|
||||||
texliveSmall
|
texliveSmall
|
||||||
|
|
|
@ -46,12 +46,6 @@ stdenv.mkDerivation rec {
|
||||||
|
|
||||||
configureFlags = [ "--disable-update-mimedb" ];
|
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;
|
enableParallelBuilding = true;
|
||||||
|
|
||||||
passthru.updateScript = mateUpdateScript { inherit pname; };
|
passthru.updateScript = mateUpdateScript { inherit pname; };
|
||||||
|
|
|
@ -22,12 +22,6 @@ stdenv.mkDerivation rec {
|
||||||
sha256 = "18n3l9zcldyvn4lwi8izd62307mkhz873039nl6awrv285qzah34";
|
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 ];
|
nativeBuildInputs = [ pkg-config ];
|
||||||
buildInputs = [
|
buildInputs = [
|
||||||
mono
|
mono
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue