about summary refs log tree commit diff
path: root/pkgs/applications/science
diff options
context:
space:
mode:
authorVladimír Čunát <vcunat@gmail.com>2013-02-24 15:11:19 +0100
committerVladimír Čunát <vcunat@gmail.com>2013-02-24 15:11:19 +0100
commit7421ee673ceb2da35429c9a3d208b7c1428eae23 (patch)
treea14ba2e45cca943f2c2fb058950e45cfd7ee6820 /pkgs/applications/science
parent07d26cea06c6609322944b67f0a75232fc202465 (diff)
downloadnixlib-7421ee673ceb2da35429c9a3d208b7c1428eae23.tar
nixlib-7421ee673ceb2da35429c9a3d208b7c1428eae23.tar.gz
nixlib-7421ee673ceb2da35429c9a3d208b7c1428eae23.tar.bz2
nixlib-7421ee673ceb2da35429c9a3d208b7c1428eae23.tar.lz
nixlib-7421ee673ceb2da35429c9a3d208b7c1428eae23.tar.xz
nixlib-7421ee673ceb2da35429c9a3d208b7c1428eae23.tar.zst
nixlib-7421ee673ceb2da35429c9a3d208b7c1428eae23.zip
qucs: minor update and fix for new gcc
Diffstat (limited to 'pkgs/applications/science')
-rw-r--r--pkgs/applications/science/electronics/qucs/default.nix7
-rw-r--r--pkgs/applications/science/electronics/qucs/tr1-complex.patch10
2 files changed, 15 insertions, 2 deletions
diff --git a/pkgs/applications/science/electronics/qucs/default.nix b/pkgs/applications/science/electronics/qucs/default.nix
index 979faa2e5977..e434c97db2b0 100644
--- a/pkgs/applications/science/electronics/qucs/default.nix
+++ b/pkgs/applications/science/electronics/qucs/default.nix
@@ -1,13 +1,16 @@
 {stdenv, fetchurl, qt3, libX11}:
 
 stdenv.mkDerivation rec {
-  name = "qucs-0.0.15";
+  name = "qucs-0.0.16";
 
   src = fetchurl {
     url = "mirror://sourceforge/qucs/${name}.tar.gz";
-    sha256 = "0ggs2nicj8q270l0rbmzg4jc0d0zdxvfsjh4wgww670ma5855xsp";
+    sha256 = "1h8ba84k06rix5zl5p9p414zj2facbnlf1vxwh4a1sp4h9dbfnzy";
   };
 
+  patches = [ ./tr1-complex.patch ];
+  patchFlags = "-p0";
+
   buildInputs = [ qt3 libX11 ];
 
   meta = {
diff --git a/pkgs/applications/science/electronics/qucs/tr1-complex.patch b/pkgs/applications/science/electronics/qucs/tr1-complex.patch
new file mode 100644
index 000000000000..0be7ae00eb95
--- /dev/null
+++ b/pkgs/applications/science/electronics/qucs/tr1-complex.patch
@@ -0,0 +1,10 @@
+--- qucs-core/configure.orig	2011-07-03 07:34:09.069218113 -0500
++++ qucs-core/configure	2011-07-03 07:34:46.618990497 -0500
+@@ -5884,7 +5884,6 @@
+ 
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+-#include <tr1/complex>
+ using namespace std;
+ using namespace std::tr1;
+ int