qucs: 0.0.18 -> 0.0.19

This commit is contained in:
Samuel Leathers 2017-09-03 14:21:52 -04:00
parent df1d5a4827
commit 00753e078d
2 changed files with 47 additions and 6 deletions

View File

@ -0,0 +1,34 @@
diff --git i/qucs-core/CMakeLists.txt w/qucs-core/CMakeLists.txt
index 2dbbd41..d174b50 100644
--- i/qucs-core/CMakeLists.txt
+++ w/qucs-core/CMakeLists.txt
@@ -158,26 +158,9 @@ ENDIF()
#
# Need Bison
-#
-# This is a HACK to get arround a PATH issue with Qt Creator on OSX.
-# It seams impossible to pass a custom PATH to Qt Creator on OSX, ie, cannot prepend `/usr/local/bin/` for intance.
-# The FIND_PACKAGE fails. For now we provide a fallback with a custom FIND_PROGRAM. The variable BISON_DIR is also available.
-IF(WIN32)
- FIND_PACKAGE(BISON 2.4 REQUIRED)
- IF(BISON_FOUND)
- #MESSAGE(STATUS "Found bison: ${BISON_EXECUTABLE} / Version: ${BISON_VERSION}" )
- ENDIF()
-ELSE() # Linux, OSX
- # use -DBISON_DIR=/path/ to provide the path to bison
- FIND_PROGRAM( BISON_EXECUTABLE bison
- PATHS /usr/local/bin/ /opt/local/bin/ /usr/bin ${BISON_DIR}
- DOC "bison path"
- NO_DEFAULT_PATH )
- IF(BISON_EXECUTABLE )
- MESSAGE(STATUS "Found bison: " ${BISON_EXECUTABLE})
- ELSE()
- MESSAGE(FATAL_ERROR "Unable to find bison. Try to provide -DBISON_DIR=[path]")
- ENDIF()
+FIND_PACKAGE(BISON 2.4 REQUIRED)
+IF(BISON_FOUND)
+ #MESSAGE(STATUS "Found bison: ${BISON_EXECUTABLE} / Version: ${BISON_VERSION}" )
ENDIF()
#

View File

@ -1,16 +1,23 @@
{stdenv, fetchurl, flex, bison, qt4, libX11 }:
{stdenv, fetchFromGitHub, flex, bison, qt4, libX11, cmake, gperf, adms }:
stdenv.mkDerivation rec {
name = "qucs-0.0.18";
version = "0.0.19";
name = "qucs-${version}";
src = fetchurl {
url = "mirror://sourceforge/qucs/${name}.tar.gz";
sha256 = "3609a18b57485dc9f19886ac6694667f3251702175bd1cbbbea37981b2c482a7";
src = fetchFromGitHub {
owner = "Qucs";
repo = "qucs";
rev = "qucs-${version}";
sha256 = "106h3kjyg7c0hkmzkin7h8fcl32n60835121b2qqih8ixi6r5id6";
};
QTDIR=qt4;
buildInputs = [ flex bison qt4 libX11 ];
patches = [
./cmakelists.patch
];
buildInputs = [ flex bison qt4 libX11 cmake gperf adms ];
meta = {
description = "Integrated circuit simulator";