diff options
| author | timor <timor.dd@googlemail.com> | 2017-09-11 20:26:24 +0200 |
|---|---|---|
| committer | Aristid Breitkreuz <aristidb@gmail.com> | 2017-09-11 20:26:24 +0200 |
| commit | 124b3c8eadf2d97c77d50121d1a884b59ec041b7 (patch) | |
| tree | 876068c6d24990735cbee593391e3bb31642c48f /pkgs/applications/science/electronics/qfsm | |
| parent | 334e23d244d46f949feef7863ae5eb91e35e33e8 (diff) | |
| download | nixlib-124b3c8eadf2d97c77d50121d1a884b59ec041b7.tar nixlib-124b3c8eadf2d97c77d50121d1a884b59ec041b7.tar.gz nixlib-124b3c8eadf2d97c77d50121d1a884b59ec041b7.tar.bz2 nixlib-124b3c8eadf2d97c77d50121d1a884b59ec041b7.tar.lz nixlib-124b3c8eadf2d97c77d50121d1a884b59ec041b7.tar.xz nixlib-124b3c8eadf2d97c77d50121d1a884b59ec041b7.tar.zst nixlib-124b3c8eadf2d97c77d50121d1a884b59ec041b7.zip | |
qfsm: fix build with gcc 6 (#29245)
Diffstat (limited to 'pkgs/applications/science/electronics/qfsm')
| -rw-r--r-- | pkgs/applications/science/electronics/qfsm/default.nix | 5 | ||||
| -rw-r--r-- | pkgs/applications/science/electronics/qfsm/gcc6-fixes.patch | 20 |
2 files changed, 24 insertions, 1 deletions
diff --git a/pkgs/applications/science/electronics/qfsm/default.nix b/pkgs/applications/science/electronics/qfsm/default.nix index 56bc66eb3caf..0e2295479af3 100644 --- a/pkgs/applications/science/electronics/qfsm/default.nix +++ b/pkgs/applications/science/electronics/qfsm/default.nix @@ -10,7 +10,10 @@ stdenv.mkDerivation rec { buildInputs = [ qt4 cmake graphviz pkgconfig ]; - patches = [ ./drop-hardcoded-prefix.patch ]; + patches = [ + ./drop-hardcoded-prefix.patch + ./gcc6-fixes.patch + ]; hardeningDisable = [ "format" ]; diff --git a/pkgs/applications/science/electronics/qfsm/gcc6-fixes.patch b/pkgs/applications/science/electronics/qfsm/gcc6-fixes.patch new file mode 100644 index 000000000000..5cedc6476397 --- /dev/null +++ b/pkgs/applications/science/electronics/qfsm/gcc6-fixes.patch @@ -0,0 +1,20 @@ +--- qfsm-0.54.0-Source-orig/src/FileIO.cpp 2015-01-02 19:01:46.000000000 +0100 ++++ qfsm-0.54.0-Source/src/FileIO.cpp 2017-09-11 19:53:30.579488402 +0200 +@@ -1617,7 +1617,7 @@ + QString ext; + + if (!imp) +- return FALSE; ++ return NULL; + + Project* p=NULL; + importdlg->setAcceptMode(QFileDialog::AcceptOpen); +@@ -1641,7 +1641,7 @@ + ifstream fin(act_importfile); + + if (!fin) +- return FALSE; ++ return NULL; + + emit setWaitCursor(); + |