diff options
author | Evgeny Egorochkin <phreedom@yandex.ru> | 2014-02-02 07:43:00 +0200 |
---|---|---|
committer | Evgeny Egorochkin <phreedom@yandex.ru> | 2014-02-02 07:43:56 +0200 |
commit | 37b1c1481be10e20be0f05cf687eefcd303246cf (patch) | |
tree | df19ccf34a07ef403c6269bb3bba854a34786ee2 | |
parent | a7373528628c47edd57a62bb7ad9bed6259127fa (diff) | |
download | nixlib-37b1c1481be10e20be0f05cf687eefcd303246cf.tar nixlib-37b1c1481be10e20be0f05cf687eefcd303246cf.tar.gz nixlib-37b1c1481be10e20be0f05cf687eefcd303246cf.tar.bz2 nixlib-37b1c1481be10e20be0f05cf687eefcd303246cf.tar.lz nixlib-37b1c1481be10e20be0f05cf687eefcd303246cf.tar.xz nixlib-37b1c1481be10e20be0f05cf687eefcd303246cf.tar.zst nixlib-37b1c1481be10e20be0f05cf687eefcd303246cf.zip |
bangarang: fix build with gcc 4.7
-rw-r--r-- | pkgs/applications/video/bangarang/default.nix | 2 | ||||
-rw-r--r-- | pkgs/applications/video/bangarang/gcc-4.7.patch | 45 |
2 files changed, 47 insertions, 0 deletions
diff --git a/pkgs/applications/video/bangarang/default.nix b/pkgs/applications/video/bangarang/default.nix index 5dde88076a1e..1058243c0e08 100644 --- a/pkgs/applications/video/bangarang/default.nix +++ b/pkgs/applications/video/bangarang/default.nix @@ -10,6 +10,8 @@ stdenv.mkDerivation rec { buildInputs = [ kdelibs phonon soprano shared_desktop_ontologies kdemultimedia taglib gettext ]; nativeBuildInputs = [ cmake ]; + patches = [ ./gcc-4.7.patch ]; + meta = with stdenv.lib; { description = "A media player for KDE based on Nepomuk and Phonon"; longDescription = '' diff --git a/pkgs/applications/video/bangarang/gcc-4.7.patch b/pkgs/applications/video/bangarang/gcc-4.7.patch new file mode 100644 index 000000000000..d4f650b9caf5 --- /dev/null +++ b/pkgs/applications/video/bangarang/gcc-4.7.patch @@ -0,0 +1,45 @@ +commit b893fcdb7ddfc8c59fd29a29b7265a713c3dbab1 +Author: Alex Fiestas <afiestas@kde.org> +Date: Thu Mar 29 10:09:22 2012 +0200 + + Build fix: Add unistd.h include since sleep is defined there + +diff --git a/src/platform/infofetchers/lastfminfofetcher.cpp b/src/platform/infofetchers/lastfminfofetcher.cpp +index 0c49d69..fcc4cd3 100644 +--- a/src/platform/infofetchers/lastfminfofetcher.cpp ++++ b/src/platform/infofetchers/lastfminfofetcher.cpp +@@ -32,6 +32,8 @@ + #include <QFile> + #include <QTextEdit> + ++#include <unistd.h> ++ + LastfmInfoFetcher::LastfmInfoFetcher(QObject *parent) : + InfoFetcher(parent) + { +diff --git a/src/platform/infofetchers/tmdbinfofetcher.cpp b/src/platform/infofetchers/tmdbinfofetcher.cpp +index 7801644..3c01960 100644 +--- a/src/platform/infofetchers/tmdbinfofetcher.cpp ++++ b/src/platform/infofetchers/tmdbinfofetcher.cpp +@@ -30,6 +30,8 @@ + #include <QDomDocument> + #include <QFile> + ++#include <unistd.h> ++ + TMDBInfoFetcher::TMDBInfoFetcher(QObject *parent) : + InfoFetcher(parent) + { +diff --git a/src/platform/infofetchers/tvdbinfofetcher.cpp b/src/platform/infofetchers/tvdbinfofetcher.cpp +index ff351b0..670ed18 100644 +--- a/src/platform/infofetchers/tvdbinfofetcher.cpp ++++ b/src/platform/infofetchers/tvdbinfofetcher.cpp +@@ -30,6 +30,8 @@ + #include <QDomDocument> + #include <QFile> + ++#include <unistd.h> ++ + TVDBInfoFetcher::TVDBInfoFetcher(QObject *parent) : + InfoFetcher(parent) + { |