3
0
Fork 0
forked from mirrors/nixpkgs

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.
This commit is contained in:
José Romildo Malaquias 2016-10-05 22:35:59 -03:00
parent fbe7c92bd5
commit 49bb848816
2 changed files with 1 additions and 61 deletions

View file

@ -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;
};
}

View file

@ -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 { };