diff options
| author | Evgeny Egorochkin <phreedom@yandex.ru> | 2013-05-06 18:16:08 +0300 |
|---|---|---|
| committer | Evgeny Egorochkin <phreedom@yandex.ru> | 2013-05-06 22:15:07 +0300 |
| commit | f8ee077afcb5a93a128cf89c464e79fe98014234 (patch) | |
| tree | 86f040b496ec5ea908f2a0c1d21befeed5f90a06 /pkgs/desktops | |
| parent | b2f67702082e144bd034098d3ebdf48c0dfaa50a (diff) | |
| download | nixlib-f8ee077afcb5a93a128cf89c464e79fe98014234.tar nixlib-f8ee077afcb5a93a128cf89c464e79fe98014234.tar.gz nixlib-f8ee077afcb5a93a128cf89c464e79fe98014234.tar.bz2 nixlib-f8ee077afcb5a93a128cf89c464e79fe98014234.tar.lz nixlib-f8ee077afcb5a93a128cf89c464e79fe98014234.tar.xz nixlib-f8ee077afcb5a93a128cf89c464e79fe98014234.tar.zst nixlib-f8ee077afcb5a93a128cf89c464e79fe98014234.zip | |
KDE4.10 dolphin-plugins-*: fix the build.
Patch contributed by Karn Kallio.
Diffstat (limited to 'pkgs/desktops')
5 files changed, 26 insertions, 10 deletions
diff --git a/pkgs/desktops/kde-4.10/default.nix b/pkgs/desktops/kde-4.10/default.nix index 3b38c7ec3f92..4ea8b6acd444 100644 --- a/pkgs/desktops/kde-4.10/default.nix +++ b/pkgs/desktops/kde-4.10/default.nix @@ -27,10 +27,10 @@ let { name="lokalize"; } { name = "kioslave-svn"; sane = "kioslave_svn"; subdir = "kdesdk-kioslaves"; } { name = "kioslave-perldoc"; sane = "kioslave_perldoc"; subdir = "kdesdk-kioslaves"; } - { name="dolphin-plugins-svn"; sane="dolphin_plugins_svn";subdir="dolphin-plugins/svn"; } - { name="dolphin-plugins-git"; sane="dolphin_plugins_git";subdir="dolphin-plugins/git"; } - { name="dolphin-plugins-hg"; sane="dolphin_plugins_hg";subdir="dolphin-plugins/hg"; } - { name="dolphin-plugins-bazaar"; sane="dolphin_plugins_bazaar";subdir="dolphin-plugins/bazaar"; } + { name="dolphin-plugins-svn"; sane="dolphin_plugins_svn";subdir="dolphin-plugins"; } + { name="dolphin-plugins-git"; sane="dolphin_plugins_git";subdir="dolphin-plugins"; } + { name="dolphin-plugins-hg"; sane="dolphin_plugins_hg";subdir="dolphin-plugins"; } + { name="dolphin-plugins-bazaar"; sane="dolphin_plugins_bazaar";subdir="dolphin-plugins"; } { name="kcachegrind"; } { name="kapptemplate"; } { name="kdesdk-strigi-analyzers"; sane="kdesdk_strigi_analyzers";} diff --git a/pkgs/desktops/kde-4.10/kdesdk/dolphin-plugins-bazaar.nix b/pkgs/desktops/kde-4.10/kdesdk/dolphin-plugins-bazaar.nix index 9b3a474d3fcc..500dffc809e9 100644 --- a/pkgs/desktops/kde-4.10/kdesdk/dolphin-plugins-bazaar.nix +++ b/pkgs/desktops/kde-4.10/kdesdk/dolphin-plugins-bazaar.nix @@ -1,11 +1,15 @@ { kde, kdelibs, kde_baseapps }: kde { -#todo: doesn't build + # Needs kdebase for libkonq buildInputs = [ kdelibs kde_baseapps ]; + patchPhase = '' + sed -i 's@macro_optional_add_subdirectory(bazaar)@add_subdirectory(bazaar)@' dolphin-plugins/CMakeLists.txt + ''; + meta = { - description = "Svn plugin for dolphin"; + description = "Bazaar plugin for dolphin"; }; } diff --git a/pkgs/desktops/kde-4.10/kdesdk/dolphin-plugins-git.nix b/pkgs/desktops/kde-4.10/kdesdk/dolphin-plugins-git.nix index d28a8d726ccc..2da3603c3bec 100644 --- a/pkgs/desktops/kde-4.10/kdesdk/dolphin-plugins-git.nix +++ b/pkgs/desktops/kde-4.10/kdesdk/dolphin-plugins-git.nix @@ -1,10 +1,14 @@ { kde, kdelibs, kde_baseapps }: kde { -#todo: doesn't build + # Needs kdebase for libkonq buildInputs = [ kdelibs kde_baseapps ]; + patchPhase = '' + sed -i 's@macro_optional_add_subdirectory(git)@add_subdirectory(git)@' dolphin-plugins/CMakeLists.txt + ''; + meta = { description = "Git plugin for dolphin"; }; diff --git a/pkgs/desktops/kde-4.10/kdesdk/dolphin-plugins-hg.nix b/pkgs/desktops/kde-4.10/kdesdk/dolphin-plugins-hg.nix index 9b3a474d3fcc..20925842a32d 100644 --- a/pkgs/desktops/kde-4.10/kdesdk/dolphin-plugins-hg.nix +++ b/pkgs/desktops/kde-4.10/kdesdk/dolphin-plugins-hg.nix @@ -1,11 +1,15 @@ { kde, kdelibs, kde_baseapps }: kde { -#todo: doesn't build + # Needs kdebase for libkonq buildInputs = [ kdelibs kde_baseapps ]; + patchPhase = '' + sed -i 's@macro_optional_add_subdirectory(hg)@add_subdirectory(hg)@' dolphin-plugins/CMakeLists.txt + ''; + meta = { - description = "Svn plugin for dolphin"; + description = "Mercurial plugin for dolphin"; }; } diff --git a/pkgs/desktops/kde-4.10/kdesdk/dolphin-plugins-svn.nix b/pkgs/desktops/kde-4.10/kdesdk/dolphin-plugins-svn.nix index 9b3a474d3fcc..fafdcc55a1f0 100644 --- a/pkgs/desktops/kde-4.10/kdesdk/dolphin-plugins-svn.nix +++ b/pkgs/desktops/kde-4.10/kdesdk/dolphin-plugins-svn.nix @@ -1,10 +1,14 @@ { kde, kdelibs, kde_baseapps }: kde { -#todo: doesn't build + # Needs kdebase for libkonq buildInputs = [ kdelibs kde_baseapps ]; + patchPhase = '' + sed -i 's@macro_optional_add_subdirectory(svn)@add_subdirectory(svn)@' dolphin-plugins/CMakeLists.txt + ''; + meta = { description = "Svn plugin for dolphin"; }; |