summary refs log tree commit diff
diff options
context:
space:
mode:
authorSergei Trofimovich <slyich@gmail.com>2023-05-12 22:48:06 +0100
committerSergei Trofimovich <slyich@gmail.com>2023-05-12 22:48:06 +0100
commit944aa75afa56a2f258ef9a9bfa3f1f869697e544 (patch)
tree1d89c81a21b62c71a4dfaf0f7de07929df4c1689
parent587ac4e842be36ca36900c6f3b0343b7e01117a6 (diff)
downloadnixpkgs-944aa75afa56a2f258ef9a9bfa3f1f869697e544.tar
nixpkgs-944aa75afa56a2f258ef9a9bfa3f1f869697e544.tar.gz
nixpkgs-944aa75afa56a2f258ef9a9bfa3f1f869697e544.tar.bz2
nixpkgs-944aa75afa56a2f258ef9a9bfa3f1f869697e544.tar.lz
nixpkgs-944aa75afa56a2f258ef9a9bfa3f1f869697e544.tar.xz
nixpkgs-944aa75afa56a2f258ef9a9bfa3f1f869697e544.tar.zst
nixpkgs-944aa75afa56a2f258ef9a9bfa3f1f869697e544.zip
infamousPlugins: fix build on glibc-2.36
Without the change build fails as:

    src/casynth/casynth_ui_main.cxx:47:27: error: 'time' was not declared in this scope
    and ((unsigned int) time (NULL));
                        ^~~~
    src/casynth/casynth_ui_main.cxx:9:1: note: 'time' is defined in header '<ctime>'; did you forget to '#include <ctime>'?
        8 | #include "casynth_ui.h"
      +++ |+#include <ctime>
        9 | #include "lv2/lv2plug.in/ns/extensions/ui/ui.h"

Full build log: https://hydra.nixos.org/log/dh6qh731kjkizpymf8qpbi33pwq7bg9v-infamousPlugins-0.3.0.drv

ZHF: #230712
-rw-r--r--pkgs/applications/audio/infamousPlugins/default.nix24
1 files changed, 23 insertions, 1 deletions
diff --git a/pkgs/applications/audio/infamousPlugins/default.nix b/pkgs/applications/audio/infamousPlugins/default.nix
index dd96f720e93..03ef83bd6fa 100644
--- a/pkgs/applications/audio/infamousPlugins/default.nix
+++ b/pkgs/applications/audio/infamousPlugins/default.nix
@@ -1,4 +1,19 @@
-{ lib, stdenv, fetchFromGitHub, fetchpatch, pkg-config, cairomm, cmake, lv2, libpthreadstubs, libXdmcp, libXft, ntk, pcre, fftwFloat, zita-resampler }:
+{ lib
+, stdenv
+, fetchFromGitHub
+, fetchpatch
+, pkg-config
+, cairomm
+, cmake
+, lv2
+, libpthreadstubs
+, libXdmcp
+, libXft
+, ntk
+, pcre
+, fftwFloat
+, zita-resampler
+}:
 
 stdenv.mkDerivation rec {
   pname = "infamousPlugins";
@@ -16,6 +31,13 @@ stdenv.mkDerivation rec {
       url = "https://github.com/ssj71/infamousPlugins/commit/06dd967b4736ea886dc1dc07f882cb1563961582.patch";
       sha256 = "08xwh6px13y1gykaw103nhvjms7vgbgkcm0avh9f5d2d7aadq0l2";
     })
+
+    # glibx-2.36 upstream fix: https://github.com/ssj71/infamousPlugins/pull/52
+    (fetchpatch {
+      name = "glibc-2.36.patch";
+      url = "https://github.com/ssj71/infamousPlugins/commit/eb4fd9af25362fdd006549c471f4cf0427816dd5.patch";
+      hash = "sha256-kBB2meQYVoVSTHIG77M8Fmeve87JBIUjpWCP6oiOkKI=";
+    })
   ];
   nativeBuildInputs = [ pkg-config cmake ];
   buildInputs = [ cairomm lv2 libpthreadstubs libXdmcp libXft ntk pcre fftwFloat zita-resampler ];