about summary refs log tree commit diff
path: root/pkgs
diff options
context:
space:
mode:
authorLluís Batlle i Rossell <viric@vicerveza.homeunix.net>2010-06-21 20:34:23 +0000
committerLluís Batlle i Rossell <viric@vicerveza.homeunix.net>2010-06-21 20:34:23 +0000
commit99a94a777b214ba9dbd2484f8cbaed526724ab1c (patch)
treedfe208bd425f8e5268f76b6c17d8ac56dbcb28e1 /pkgs
parent74d75bdd6c89f50f3a12c17f973ba20e74c3afbd (diff)
downloadnixlib-99a94a777b214ba9dbd2484f8cbaed526724ab1c.tar
nixlib-99a94a777b214ba9dbd2484f8cbaed526724ab1c.tar.gz
nixlib-99a94a777b214ba9dbd2484f8cbaed526724ab1c.tar.bz2
nixlib-99a94a777b214ba9dbd2484f8cbaed526724ab1c.tar.lz
nixlib-99a94a777b214ba9dbd2484f8cbaed526724ab1c.tar.xz
nixlib-99a94a777b214ba9dbd2484f8cbaed526724ab1c.tar.zst
nixlib-99a94a777b214ba9dbd2484f8cbaed526724ab1c.zip
Updating ngspice
svn path=/nixpkgs/trunk/; revision=22364
Diffstat (limited to 'pkgs')
-rw-r--r--pkgs/applications/science/electronics/ngspice/default.nix25
-rw-r--r--pkgs/top-level/all-packages.nix3
2 files changed, 17 insertions, 11 deletions
diff --git a/pkgs/applications/science/electronics/ngspice/default.nix b/pkgs/applications/science/electronics/ngspice/default.nix
index c172075f11f8..c7ddceb6b87d 100644
--- a/pkgs/applications/science/electronics/ngspice/default.nix
+++ b/pkgs/applications/science/electronics/ngspice/default.nix
@@ -1,17 +1,22 @@
-args:
-args.stdenv.mkDerivation {
-  name = "ng-spice-rework-15c";
+{stdenv, fetchurl, readline, bison, libX11, libICE, libXaw, libXext}:
 
-  src = args.fetchurl {
-    url = mirror://sourceforge/ngspice/ng-spice-rework-15c.tar.gz;
-    sha256 = "0v0pbdc54ra0s98dz6mhj80n333ggbn4xpf53vi66sd02hcjblmg";
+stdenv.mkDerivation {
+  name = "ng-spice-rework-21";
+
+  src = fetchurl {
+    url = mirror://sourceforge/ngspice/ng-spice-rework-21.tar.gz;
+    sha256 = "1hmvfl33dszy8xgbixx0zmiz4rdzjhl7lwlwm953jibd4dgx42j5";
   };
 
-  buildInputs =(with args; [readline]);
+  buildInputs = [ readline libX11 bison libICE libXaw libXext ];
+
+  configureFlags = [ "--enable-x" "--with-x" "--with-readline" ];
 
   meta = {
-      description = "The Next Generation Spice (Electronic Circuit Simulator).";
-      homepage = http://ngspice.sourceforge.net;
-      license = ["BSD" "GPLv2"];
+    description = "The Next Generation Spice (Electronic Circuit Simulator).";
+    homepage = http://ngspice.sourceforge.net;
+    license = ["BSD" "GPLv2"];
+    maintainers = with stdenv.lib.maintainers; [viric];
+    platforms = with stdenv.lib.platforms; linux;
   };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 93c07303b26c..e3df7e1c000c 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9543,7 +9543,8 @@ let
   ### SCIENCE / ELECTRONICS
 
   ngspice = import ../applications/science/electronics/ngspice {
-    inherit fetchurl stdenv readline;
+    inherit fetchurl stdenv readline bison;
+    inherit (xlibs) libX11 libICE libXaw libXext;
   };
 
   gtkwave = import ../applications/science/electronics/gtkwave {