thunar-dropbox-plugin: fixup after #9935

Close #9935.
I don't think it's good to split thunarx into a separate derivation in
this way. We would have the library and associated stuff twice and two
expressions, etc. Distributions do these things by an analogy to multiple-output
derivation (Debian does, for example), so we could use that, but it
doesn't seem important in this case and would be better after #7701 anyway.

3 files changed, 7 insertions, 48 deletions

diff --git a/pkgs/desktops/xfce/core/thunarx-2-dev.nix b/pkgs/desktops/xfce/core/thunarx-2-dev.nix
deleted file mode 100644
index 2cce01b75e7c..000000000000
--- a/pkgs/desktops/xfce/core/thunarx-2-dev.nix
+++ /dev/null
@@ -1,38 +0,0 @@
-{ stdenv, fetchurl, pkgconfig, intltool
-, gtk, dbus_glib, libstartup_notification, libnotify, libexif, pcre, udev
-, exo, libxfce4util
-, xfconf, libxfce4ui
-}:
-
-stdenv.mkDerivation rec {
-  host_p_name = "thunar";
-  p_name = "thunarx-2-dev";
-  ver_maj = "1.6";
-  ver_min = "6";
-
-  src = fetchurl {
-    url = "mirror://xfce/src/xfce/${host_p_name}/${ver_maj}/Thunar-${ver_maj}.${ver_min}.tar.bz2";
-    sha256 = "1cl9v3rdzipyyxml3pyrzspxfmmssz5h5snpj18irq4an42539dr";
-  };
-  name = "${p_name}-${ver_maj}.${ver_min}";
-
-  preBuild = ''
-    cd thunarx
-  '';
-
-  buildInputs = [
-    pkgconfig intltool
-    gtk dbus_glib libstartup_notification libnotify libexif pcre udev
-    exo libxfce4util 
-    xfconf libxfce4ui
-  ];
-
-  enableParallelBuilding = true;
-
-  meta = {
-    homepage = http://thunar.xfce.org/;
-    description = "Thunar Extension Framework";
-    license = stdenv.lib.licenses.gpl2Plus;
-    platforms = stdenv.lib.platforms.linux;
-  };
-}
diff --git a/pkgs/desktops/xfce/default.nix b/pkgs/desktops/xfce/default.nix
index f348c98e803a..a9903c941bfe 100644
--- a/pkgs/desktops/xfce/default.nix
+++ b/pkgs/desktops/xfce/default.nix
@@ -25,11 +25,9 @@ xfce_self = rec { # the lines are very long but it seems better than the even-od
   libxfce4util    = callPackage ./core/libxfce4util.nix { };
   libxfcegui4     = callPackage ./core/libxfcegui4.nix { };
   thunar          = callPackage ./core/thunar.nix { };
-  thunarx-2-dev   = callPackage ./core/thunarx-2-dev.nix { };
   thunar_volman   = callPackage ./core/thunar-volman.nix { }; # ToDo: probably inside Thunar now
-  thunar_archive_plugin  = callPackage ./core/thunar-archive-plugin.nix { };
-  thunar-dropbox-plugin 
-                  = callPackage ./thunar-plugins/dropbox { };
+  thunar_archive_plugin = callPackage ./core/thunar-archive-plugin.nix { };
+  thunar-dropbox-plugin = callPackage ./thunar-plugins/dropbox { };
   tumbler         = callPackage ./core/tumbler.nix { };
   xfce4panel      = callPackage ./core/xfce4-panel.nix { }; # ToDo: impure plugins from /run/current-system/sw/lib/xfce4
   xfce4session    = callPackage ./core/xfce4-session.nix { };
diff --git a/pkgs/desktops/xfce/thunar-plugins/dropbox/default.nix b/pkgs/desktops/xfce/thunar-plugins/dropbox/default.nix
index 4027e5cb996c..cf83386fa261 100644
--- a/pkgs/desktops/xfce/thunar-plugins/dropbox/default.nix
+++ b/pkgs/desktops/xfce/thunar-plugins/dropbox/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchurl, pkgconfig
 , gtk
-, thunarx-2-dev, python2
+, thunar, python2
 }:
 
 stdenv.mkDerivation rec {
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
   buildInputs = [
     pkgconfig
     gtk
-    thunarx-2-dev python2
+    thunar python2
   ];
 
   configurePhase = "python2 waf configure --prefix=$out";
@@ -30,13 +30,12 @@ stdenv.mkDerivation rec {
 
   preFixup = "rm $out/share/icons/hicolor/icon-theme.cache";
 
-
   enableParallelBuilding = true;
 
-  meta = {
+  meta = with stdenv.lib; {
     homepage = http://softwarebakery.com/maato/thunar-dropbox.html;
     description = "A plugin for thunar that adds context-menu items from dropbox";
-    license = stdenv.lib.licenses.gpl3;
-    platforms = stdenv.lib.platforms.linux;
+    license = licenses.gpl3;
+    platforms = platforms.linux;
   };
 }