From 2d51cceda419f47ca03960728911cbec7d13c2db Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Thu, 30 Aug 2018 02:00:40 +0200 Subject: [PATCH] libfm: switch to fresher vala --- pkgs/development/libraries/libfm/default.nix | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/pkgs/development/libraries/libfm/default.nix b/pkgs/development/libraries/libfm/default.nix index ce1d3b138f88..796c03dab5ee 100644 --- a/pkgs/development/libraries/libfm/default.nix +++ b/pkgs/development/libraries/libfm/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, glib, intltool, menu-cache, pango, pkgconfig, vala_0_34 +{ stdenv, fetchurl, glib, intltool, menu-cache, pango, pkgconfig, vala , extraOnly ? false , withGtk3 ? false, gtk2, gtk3 }: let @@ -16,12 +16,11 @@ stdenv.mkDerivation rec { sha256 = "0wkwbi1nyvqza3r1dhrq846axiiq0fy0dqgngnagh76fjrwnzl0q"; }; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ glib gtk intltool pango vala_0_34 ] - ++ optional (!extraOnly) menu-cache; + nativeBuildInputs = [ vala pkgconfig intltool ]; + buildInputs = [ glib gtk pango ] ++ optional (!extraOnly) menu-cache; - configureFlags = [ (optional extraOnly "--with-extra-only") - (optional withGtk3 "--with-gtk=3") ]; + configureFlags = optional extraOnly "--with-extra-only" + ++ optional withGtk3 "--with-gtk=3"; enableParallelBuilding = true;