From fc930e055a11b88b9c9ab1d2c26dcda5ff5fc93f Mon Sep 17 00:00:00 2001 From: Orivej Desh Date: Sun, 10 Dec 2017 08:43:26 +0000 Subject: rawtherapee: delete unused files --- .../graphics/rawtherapee/ReleaseInfo.cmake | 4 ---- pkgs/applications/graphics/rawtherapee/default.nix | 4 ++-- .../graphics/rawtherapee/fix-glibmm-output.patch | 23 ---------------------- 3 files changed, 2 insertions(+), 29 deletions(-) delete mode 100644 pkgs/applications/graphics/rawtherapee/ReleaseInfo.cmake delete mode 100644 pkgs/applications/graphics/rawtherapee/fix-glibmm-output.patch (limited to 'pkgs/applications/graphics') diff --git a/pkgs/applications/graphics/rawtherapee/ReleaseInfo.cmake b/pkgs/applications/graphics/rawtherapee/ReleaseInfo.cmake deleted file mode 100644 index 7be7cb63f701..000000000000 --- a/pkgs/applications/graphics/rawtherapee/ReleaseInfo.cmake +++ /dev/null @@ -1,4 +0,0 @@ -set(GIT_BRANCH master) -set(GIT_VERSION 4.2.1115) -set(GIT_CHANGESET 0821eea7b6a4ac2fce1fcf644e06078e161e41e3) -set(GIT_TAGDISTANCE 1115) diff --git a/pkgs/applications/graphics/rawtherapee/default.nix b/pkgs/applications/graphics/rawtherapee/default.nix index 91a34a505f2f..5743f0c1bcb6 100644 --- a/pkgs/applications/graphics/rawtherapee/default.nix +++ b/pkgs/applications/graphics/rawtherapee/default.nix @@ -14,10 +14,10 @@ stdenv.mkDerivation rec { sha256 = "1r6sx9zl1wkykgfx6k26268xadair6hzl15v5hmiri9sdhrn33q7"; }; - nativeBuildInputs = [ pkgconfig wrapGAppsHook ]; + nativeBuildInputs = [ cmake pkgconfig wrapGAppsHook ]; buildInputs = [ - cmake pixman libpthreadstubs gtkmm3 libXau libXdmcp + pixman libpthreadstubs gtkmm3 libXau libXdmcp lcms2 libiptcdata libcanberra_gtk3 fftw expat pcre libsigcxx lensfun ]; diff --git a/pkgs/applications/graphics/rawtherapee/fix-glibmm-output.patch b/pkgs/applications/graphics/rawtherapee/fix-glibmm-output.patch deleted file mode 100644 index 3c87ce64e26b..000000000000 --- a/pkgs/applications/graphics/rawtherapee/fix-glibmm-output.patch +++ /dev/null @@ -1,23 +0,0 @@ -From ca0afa8d5f3cc7d09b6bab32d155a87c550f0d7b Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Fl=C3=B6ssie?= -Date: Sat, 1 Oct 2016 12:38:24 +0200 -Subject: [PATCH] Fix incompatibility with glibmm 2.50 (#3440) - -Kudos to @Hombre57 for the suggestion. ---- - rtgui/dirbrowser.cc | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/rtgui/dirbrowser.cc b/rtgui/dirbrowser.cc -index d3fc8bf..6f25f0f 100644 ---- a/rtgui/dirbrowser.cc -+++ b/rtgui/dirbrowser.cc -@@ -59,7 +59,7 @@ std::vector listSubDirs (const Glib::RefPtr& dir, bool - } catch (const Glib::Exception& exception) { - - if (options.rtSettings.verbose) { -- std::cerr << "Failed to list subdirectories of \"" << dir << "\": " << exception.what () << std::endl; -+ std::cerr << "Failed to list subdirectories of \"" << dir->get_basename() << "\": " << exception.what () << std::endl; - } - - } -- cgit 1.4.1