From 49bb8488163dca4e7caaab07c5f2f6cadc2a2918 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= <malaquias@gmail.com>
Date: Wed, 5 Oct 2016 22:35:59 -0300
Subject: [PATCH] pcmanfm-qt: use version from the LXQt desktop

pcmanfm-qt is part of the LXQt desktop. With the addition of LXQt to
nixpkgs, including a newer package for pcmanfm-qt, the older one is
removed and the entry in all-packages refers to the one in lxqt.
---
 pkgs/applications/misc/pcmanfm-qt/default.nix | 60 -------------------
 pkgs/top-level/all-packages.nix               |  2 +-
 2 files changed, 1 insertion(+), 61 deletions(-)
 delete mode 100644 pkgs/applications/misc/pcmanfm-qt/default.nix

diff --git a/pkgs/applications/misc/pcmanfm-qt/default.nix b/pkgs/applications/misc/pcmanfm-qt/default.nix
deleted file mode 100644
index 5b270f15fb6d..000000000000
--- a/pkgs/applications/misc/pcmanfm-qt/default.nix
+++ /dev/null
@@ -1,60 +0,0 @@
-{ stdenv
-, fetchFromGitHub
-, cmake
-, pkgconfig
-, qt5
-, menu-cache
-, libfm
-, elementary-icon-theme
-}:
-
-let
-  version = "0.11.0";
-
-  buildInputsCommon = [ cmake pkgconfig qt5.qtbase qt5.qttools qt5.qtx11extras menu-cache libfm ];
-
-  libfm-qt = stdenv.mkDerivation rec {
-    name    = "${pname}-${version}";
-    pname   = "libfm-qt";
-
-    src = fetchFromGitHub {
-      owner  = "lxde";
-      repo   = pname;
-      rev    = version;
-      sha256 = "0a8rd0m66l6n2jl7fin74byyy69pyc6rgnfkpmkbi6561l903592";
-    };
-
-    buildInputs = buildInputsCommon;
-  };
-
-in stdenv.mkDerivation rec {
-  name    = "${pname}-${version}";
-  pname   = "pcmanfm-qt";
-
-  src = fetchFromGitHub {
-    owner  = "lxde";
-    repo   = pname;
-    rev    = version;
-    sha256 = "139l8m32sqcjmydppbv24iqnfsbl5b4rqmqzdayvlh6haf1ihinn";
-  };
-
-
-  buildInputs = buildInputsCommon ++ [ libfm-qt qt5.makeQtWrapper ];
-
-  postPatch = ''
-    substituteInPlace pcmanfm/settings.cpp --replace \"elementary\" \"Elementary\"
-  '';
-
-  postInstall = ''
-    wrapQtProgram $out/bin/pcmanfm-qt \
-      --prefix XDG_DATA_DIRS : "${elementary-icon-theme}/share"
-  '';
-
-  meta = with stdenv.lib; {
-    homepage    = "https://github.com/lxde/pcmanfm-qt";
-    license     = licenses.gpl2Plus;
-    description = "File manager with QT interface";
-    maintainers = with maintainers; [ obadz ];
-    platforms   = platforms.linux;
-  };
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 95ba61ec87fd..6ecdd0434036 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -13704,7 +13704,7 @@ in
 
   pcmanfm = callPackage ../applications/misc/pcmanfm { };
 
-  pcmanfm-qt = callPackage ../applications/misc/pcmanfm-qt { };
+  pcmanfm-qt = lxqt.pcmanfm-qt;
 
   pcmanx-gtk2 = callPackage ../applications/misc/pcmanx-gtk2 { };