From 607493570f44d0c71fbef058d4e21034c7ca3dfb Mon Sep 17 00:00:00 2001 From: qbisi Date: Tue, 21 Oct 2025 01:24:37 +0800 Subject: [PATCH] ipopt: remove enable* options --- pkgs/by-name/ip/ipopt/package.nix | 33 ++++++++++++------------------- 1 file changed, 13 insertions(+), 20 deletions(-) diff --git a/pkgs/by-name/ip/ipopt/package.nix b/pkgs/by-name/ip/ipopt/package.nix index e20214342f17..8bd1e2c3e0a5 100644 --- a/pkgs/by-name/ip/ipopt/package.nix +++ b/pkgs/by-name/ip/ipopt/package.nix @@ -6,12 +6,9 @@ blas, lapack, gfortran, - enableAMPL ? true, - libamplsolver, - enableMUMPS ? true, mumps, - enableSPRAL ? true, spral, + libamplsolver, }: assert (!blas.isILP64) && (!lapack.isILP64); @@ -28,29 +25,25 @@ stdenv.mkDerivation rec { sha256 = "sha256-85fUBMwQtG+RWQYk9YzdZYK3CYcDKgWroo4blhVWBzE="; }; - configureFlags = - lib.optionals enableAMPL [ - "--with-asl-lflags=-lamplsolver" - ] - ++ lib.optionals enableMUMPS [ - "--with-mumps-cflags=-I${lib.getDev mumps}/include/mumps_seq" - "--with-mumps-lflags=-ldmumps" - ] - ++ lib.optionals enableSPRAL [ - "--with-spral-lflags=-lspral" - ]; - nativeBuildInputs = [ pkg-config gfortran ]; + buildInputs = [ blas lapack - ] - ++ lib.optionals enableAMPL [ libamplsolver ] - ++ lib.optionals enableMUMPS [ mumps ] - ++ lib.optionals enableSPRAL [ spral ]; + mumps + spral + libamplsolver + ]; + + configureFlags = [ + "--with-mumps-cflags=-I${lib.getDev mumps}/include/mumps_seq" + "--with-mumps-lflags=-ldmumps" + "--with-spral-lflags=-lspral" + "--with-asl-lflags=-lamplsolver" + ]; enableParallelBuilding = true;