From 9a6d8dd4f4130f1afe37ba110faf33a519e995c9 Mon Sep 17 00:00:00 2001 From: taku0 Date: Fri, 13 May 2016 23:35:11 +0900 Subject: [PATCH] synfigstudio: fixed build error --- .../graphics/synfigstudio/default.nix | 45 ++++++++++++++++++- pkgs/top-level/all-packages.nix | 1 + 2 files changed, 44 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/graphics/synfigstudio/default.nix b/pkgs/applications/graphics/synfigstudio/default.nix index 28a264af965c..ea0d2338252a 100644 --- a/pkgs/applications/graphics/synfigstudio/default.nix +++ b/pkgs/applications/graphics/synfigstudio/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, boost, cairo, fontsConf, gettext, glibmm, gtk3, gtkmm3 , libjack2, libsigcxx, libtool, libxmlxx, makeWrapper, mlt-qt5, pango, pkgconfig -, imagemagick, intltool, autoreconfHook, which +, imagemagick, intltool, autoreconfHook, which, defaultIconTheme }: let @@ -56,12 +56,53 @@ stdenv.mkDerivation rec { postUnpack = "sourceRoot=\${sourceRoot}/synfig-studio/"; + postPatch = '' + for i in \ + brushlib/brushlib.hpp \ + gui/canvasview.cpp \ + gui/compview.cpp \ + gui/docks/dock_canvasspecific.cpp \ + gui/docks/dock_children.cpp \ + gui/docks/dock_curves.cpp \ + gui/docks/dock_history.cpp \ + gui/docks/dock_keyframes.cpp \ + gui/docks/dock_layergroups.cpp \ + gui/docks/dock_layers.cpp \ + gui/docks/dock_metadata.cpp \ + gui/docks/dock_params.cpp \ + gui/docks/dock_timetrack.cpp \ + gui/docks/dock_toolbox.cpp \ + gui/docks/dockable.cpp \ + gui/docks/dockdialog.cpp \ + gui/docks/dockmanager.h \ + gui/duck.h \ + gui/duckmatic.cpp \ + gui/duckmatic.h \ + gui/instance.cpp \ + gui/instance.h \ + gui/states/state_stroke.h \ + gui/states/state_zoom.cpp \ + gui/widgets/widget_curves.cpp \ + gui/workarea.cpp \ + gui/workarearenderer/workarearenderer.h \ + synfigapp/action_system.h \ + synfigapp/canvasinterface.h \ + synfigapp/instance.h \ + synfigapp/main.h \ + synfigapp/uimanager.h + do + substituteInPlace src/"$i" --replace '#include ' '#include ' + substituteInPlace src/"$i" --replace '#include ' '#include ' + substituteInPlace src/"$i" --replace '#include ' '#include ' + done + ''; + preConfigure = "./bootstrap.sh"; buildInputs = [ ETL boost cairo gettext glibmm gtk3 gtkmm3 imagemagick intltool libjack2 libsigcxx libxmlxx makeWrapper mlt-qt5 pkgconfig - synfig autoreconfHook which + synfig autoreconfHook which defaultIconTheme ]; postInstall = '' diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7317adaf4eca..56fe2c35b679 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13469,6 +13469,7 @@ in synfigstudio = callPackage ../applications/graphics/synfigstudio { fontsConf = makeFontsConf { fontDirectories = [ freefont_ttf ]; }; + inherit (gnome3) defaultIconTheme; }; librep = callPackage ../development/libraries/librep { };