mirror of
https://github.com/SebastianWendel/nixpkgs.git
synced 2024-09-20 04:19:00 +02:00
ngspice: Move shared library to a new derivation
It turns out that the build system does not support building both the command-line tool and the shared library at the same time. Consequently the ngspice derivation has not provided the command-line tools since the shared library was enabled in #31166.
This commit is contained in:
parent
8cbf295b6c
commit
a62fffd9a5
|
@ -572,6 +572,11 @@
|
||||||
github = "bergey";
|
github = "bergey";
|
||||||
name = "Daniel Bergey";
|
name = "Daniel Bergey";
|
||||||
};
|
};
|
||||||
|
bgamari = {
|
||||||
|
email = "ben@smart-cactus.org";
|
||||||
|
github = "bgamari";
|
||||||
|
name = "Ben Gamari";
|
||||||
|
};
|
||||||
bhipple = {
|
bhipple = {
|
||||||
email = "bhipple@protonmail.com";
|
email = "bhipple@protonmail.com";
|
||||||
github = "bhipple";
|
github = "bhipple";
|
||||||
|
|
|
@ -3,10 +3,12 @@
|
||||||
, doxygen, pcre, libpthreadstubs, libXdmcp
|
, doxygen, pcre, libpthreadstubs, libXdmcp
|
||||||
|
|
||||||
, oceSupport ? true, opencascade_oce
|
, oceSupport ? true, opencascade_oce
|
||||||
, ngspiceSupport ? true, ngspice
|
, ngspiceSupport ? true, libngspice
|
||||||
, scriptingSupport ? true, swig, python, wxPython
|
, scriptingSupport ? true, swig, python, wxPython
|
||||||
}:
|
}:
|
||||||
|
|
||||||
|
assert ngspiceSupport -> libngspice != null;
|
||||||
|
|
||||||
with lib;
|
with lib;
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
name = "kicad-unstable-${version}";
|
name = "kicad-unstable-${version}";
|
||||||
|
@ -41,7 +43,7 @@ stdenv.mkDerivation rec {
|
||||||
libGLU_combined zlib libX11 wxGTK pcre libXdmcp gettext glew glm libpthreadstubs
|
libGLU_combined zlib libX11 wxGTK pcre libXdmcp gettext glew glm libpthreadstubs
|
||||||
cairo curl openssl boost
|
cairo curl openssl boost
|
||||||
] ++ optional (oceSupport) opencascade_oce
|
] ++ optional (oceSupport) opencascade_oce
|
||||||
++ optional (ngspiceSupport) ngspice
|
++ optional (ngspiceSupport) libngspice
|
||||||
++ optionals (scriptingSupport) [ swig python wxPython ];
|
++ optionals (scriptingSupport) [ swig python wxPython ];
|
||||||
|
|
||||||
meta = {
|
meta = {
|
||||||
|
|
|
@ -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 {
|
stdenv.mkDerivation {
|
||||||
name = "ngspice-27";
|
name = "ngspice-27";
|
||||||
|
@ -8,15 +8,16 @@ stdenv.mkDerivation {
|
||||||
sha256 = "15862npsy5sj56z5yd1qiv3y0fgicrzj7wwn8hbcy89fgbawf20c";
|
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; {
|
meta = with stdenv.lib; {
|
||||||
description = "The Next Generation Spice (Electronic Circuit Simulator)";
|
description = "The Next Generation Spice (Electronic Circuit Simulator)";
|
||||||
homepage = http://ngspice.sourceforge.net;
|
homepage = http://ngspice.sourceforge.net;
|
||||||
license = with licenses; [ "BSD" gpl2 ];
|
license = with licenses; [ "BSD" gpl2 ];
|
||||||
maintainers = with maintainers; [ viric rongcuid ];
|
maintainers = with maintainers; [ bgamari viric rongcuid ];
|
||||||
platforms = platforms.linux;
|
platforms = platforms.linux;
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
25
pkgs/development/libraries/libngspice/default.nix
Normal file
25
pkgs/development/libraries/libngspice/default.nix
Normal file
|
@ -0,0 +1,25 @@
|
||||||
|
{stdenv, fetchurl, bison, flex, fftw}:
|
||||||
|
|
||||||
|
# Note that this does not provide the ngspice command-line utility. For that see
|
||||||
|
# the ngspice derivation.
|
||||||
|
stdenv.mkDerivation {
|
||||||
|
name = "libngspice-26";
|
||||||
|
|
||||||
|
src = fetchurl {
|
||||||
|
url = "mirror://sourceforge/ngspice/ngspice-26.tar.gz";
|
||||||
|
sha256 = "51e230c8b720802d93747bc580c0a29d1fb530f3dd06f213b6a700ca9a4d0108";
|
||||||
|
};
|
||||||
|
|
||||||
|
nativeBuildInputs = [ flex bison ];
|
||||||
|
buildInputs = [ fftw ];
|
||||||
|
|
||||||
|
configureFlags = [ "--with-ngshared" "--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; [ bgamari ];
|
||||||
|
platforms = platforms.linux;
|
||||||
|
};
|
||||||
|
}
|
|
@ -3434,6 +3434,8 @@ with pkgs;
|
||||||
|
|
||||||
libnabo = callPackage ../development/libraries/libnabo { };
|
libnabo = callPackage ../development/libraries/libnabo { };
|
||||||
|
|
||||||
|
libngspice = callPackage ../development/libraries/libngspice { };
|
||||||
|
|
||||||
libpointmatcher = callPackage ../development/libraries/libpointmatcher { };
|
libpointmatcher = callPackage ../development/libraries/libpointmatcher { };
|
||||||
|
|
||||||
libtorrent = callPackage ../tools/networking/p2p/libtorrent { };
|
libtorrent = callPackage ../tools/networking/p2p/libtorrent { };
|
||||||
|
|
Loading…
Reference in a new issue