diff options
author | Jörg Thalheim <Mic92@users.noreply.github.com> | 2018-03-26 18:33:42 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-03-26 18:33:42 +0100 |
commit | 7d8d5d4f6f6eab8faf51c3b36738007f45f63991 (patch) | |
tree | 5129b92a2e5e4171afabab2938e88afc817ca316 /pkgs/applications/science | |
parent | 63a8d8c9e2d79f5286b37e9e6e9a45cce748719e (diff) | |
parent | a62fffd9a5c9441235b90c68dbd7bcba34940b6a (diff) | |
download | nixlib-7d8d5d4f6f6eab8faf51c3b36738007f45f63991.tar nixlib-7d8d5d4f6f6eab8faf51c3b36738007f45f63991.tar.gz nixlib-7d8d5d4f6f6eab8faf51c3b36738007f45f63991.tar.bz2 nixlib-7d8d5d4f6f6eab8faf51c3b36738007f45f63991.tar.lz nixlib-7d8d5d4f6f6eab8faf51c3b36738007f45f63991.tar.xz nixlib-7d8d5d4f6f6eab8faf51c3b36738007f45f63991.tar.zst nixlib-7d8d5d4f6f6eab8faf51c3b36738007f45f63991.zip |
Merge pull request #37670 from bgamari/libngspice
ngspice: Move shared library to a new derivation
Diffstat (limited to 'pkgs/applications/science')
-rw-r--r-- | pkgs/applications/science/electronics/kicad/unstable.nix | 6 | ||||
-rw-r--r-- | pkgs/applications/science/electronics/ngspice/default.nix | 9 |
2 files changed, 9 insertions, 6 deletions
diff --git a/pkgs/applications/science/electronics/kicad/unstable.nix b/pkgs/applications/science/electronics/kicad/unstable.nix index 21eddde82672..7209ee3edf60 100644 --- a/pkgs/applications/science/electronics/kicad/unstable.nix +++ b/pkgs/applications/science/electronics/kicad/unstable.nix @@ -3,10 +3,12 @@ , doxygen, pcre, libpthreadstubs, libXdmcp , oceSupport ? true, opencascade_oce -, ngspiceSupport ? true, ngspice +, ngspiceSupport ? true, libngspice , scriptingSupport ? true, swig, python, wxPython }: +assert ngspiceSupport -> libngspice != null; + with lib; stdenv.mkDerivation rec { name = "kicad-unstable-${version}"; @@ -41,7 +43,7 @@ stdenv.mkDerivation rec { libGLU_combined zlib libX11 wxGTK pcre libXdmcp gettext glew glm libpthreadstubs cairo curl openssl boost ] ++ optional (oceSupport) opencascade_oce - ++ optional (ngspiceSupport) ngspice + ++ optional (ngspiceSupport) libngspice ++ optionals (scriptingSupport) [ swig python wxPython ]; meta = { diff --git a/pkgs/applications/science/electronics/ngspice/default.nix b/pkgs/applications/science/electronics/ngspice/default.nix index 114a2eea85f5..96025e8faa62 100644 --- a/pkgs/applications/science/electronics/ngspice/default.nix +++ b/pkgs/applications/science/electronics/ngspice/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, readline, bison, flex, libX11, libICE, libXaw, libXext}: +{stdenv, fetchurl, readline, bison, flex, libX11, libICE, libXaw, libXext, fftw}: stdenv.mkDerivation { name = "ngspice-27"; @@ -8,15 +8,16 @@ stdenv.mkDerivation { sha256 = "15862npsy5sj56z5yd1qiv3y0fgicrzj7wwn8hbcy89fgbawf20c"; }; - buildInputs = [ readline libX11 flex bison libICE libXaw libXext ]; + nativeBuildInputs = [ flex bison ]; + buildInputs = [ readline libX11 libICE libXaw libXext fftw ]; - configureFlags = [ "--enable-x" "--with-x" "--with-readline" "--enable-xspice" "--enable-cider" "--with-ngshared" ]; + configureFlags = [ "--enable-x" "--with-x" "--with-readline" "--enable-xspice" "--enable-cider" ]; meta = with stdenv.lib; { description = "The Next Generation Spice (Electronic Circuit Simulator)"; homepage = http://ngspice.sourceforge.net; license = with licenses; [ "BSD" gpl2 ]; - maintainers = with maintainers; [ viric rongcuid ]; + maintainers = with maintainers; [ bgamari viric rongcuid ]; platforms = platforms.linux; }; } |