ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-11-13 21:32:23 +03:00
Code Issues Projects Releases Wiki Activity

Merge pull request #28048 from lluchs/pcmanfm-gtk3

Browse Source 
pcmanfm: build with gtk3
This commit is contained in:
Jörg Thalheim 2017-08-12 07:52:15 +01:00 committed by GitHub
commit 929b655416
2 changed files with 20 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
pkgs/applications/misc/pcmanfm/default.nix
View File

@ -1,5 +1,11 @@
{ stdenv, fetchurl, glib, gtk2, intltool, libfm, libX11, pango, pkgconfig }:
{ stdenv, fetchurl, glib, intltool, libfm, libX11, pango, pkgconfig
, wrapGAppsHook, gnome3, withGtk3 ? true, gtk2, gtk3 }:
let
libfm' = libfm.override { inherit withGtk3; };
gtk = if withGtk3 then gtk3 else gtk2;
inherit (stdenv.lib) optional;
in
stdenv.mkDerivation rec {
name = "pcmanfm-1.2.5";
src = fetchurl {
@ -7,7 +13,10 @@ stdenv.mkDerivation rec {
sha256 = "0rxdh0dfzc84l85c54blq42gczygq8adhr3l9hqzy1dp530cm1hc";
};
buildInputs = [ glib gtk2 intltool libfm libX11 pango pkgconfig ];
buildInputs = [ glib gtk libfm' libX11 pango gnome3.defaultIconTheme ];
nativeBuildInputs = [ pkgconfig wrapGAppsHook intltool ];
configureFlags = optional withGtk3 "--with-gtk=3";
meta = with stdenv.lib; {
homepage = http://blog.lxde.org/?cat=28/;

13
pkgs/development/libraries/libfm/default.nix
View File

@ -1,6 +1,8 @@
{ stdenv, fetchurl, glib, gtk2, intltool, menu-cache, pango, pkgconfig, vala_0_34
, extraOnly ? false }:
{ stdenv, fetchurl, glib, intltool, menu-cache, pango, pkgconfig, vala_0_34
, extraOnly ? false
, withGtk3 ? false, gtk2, gtk3 }:
let
gtk = if withGtk3 then gtk3 else gtk2;
inherit (stdenv.lib) optional;
in
stdenv.mkDerivation rec {
@ -14,10 +16,13 @@ stdenv.mkDerivation rec {
sha256 = "0nlvfwh09gbq8bkbvwnw6iqr918rrs9gc9ljb9pjspyg408bn1n7";
};
buildInputs = [ glib gtk2 intltool pango pkgconfig vala_0_34 ]
buildInputs = [ glib gtk intltool pango pkgconfig vala_0_34 ]
++ optional (!extraOnly) menu-cache;
configureFlags = optional extraOnly "--with-extra-only";
configureFlags = [ (optional extraOnly "--with-extra-only")
(optional withGtk3 "--with-gtk=3") ];
enableParallelBuilding = true;
meta = with stdenv.lib; {
homepage = http://blog.lxde.org/?cat=28/;