Commit 929b6554 authored by Jörg Thalheim's avatar Jörg Thalheim Committed by GitHub
Browse files

Merge pull request #28048 from lluchs/pcmanfm-gtk3 

pcmanfm: build with gtk3
parents 9b6aaa34 8cd83cde

pkgs/applications/misc/pcmanfm/default.nix

+11 −2
Original line number Diff line number Diff line 
{ 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/;

pkgs/development/libraries/libfm/default.nix

+9 −4
Original line number Diff line number Diff line 
{ 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/;