diff options
author | Jan Tojnar <jtojnar@gmail.com> | 2018-08-30 02:00:40 +0200 |
---|---|---|
committer | Jan Tojnar <jtojnar@gmail.com> | 2018-08-30 02:01:17 +0200 |
commit | 2d51cceda419f47ca03960728911cbec7d13c2db (patch) | |
tree | 3595e09b4d72d1e1d5931025c212a8f7152c53bf /pkgs/development | |
parent | 9a4240f8fbfa7554efe8a7b454d2089b0d4c21a3 (diff) | |
download | nixlib-2d51cceda419f47ca03960728911cbec7d13c2db.tar nixlib-2d51cceda419f47ca03960728911cbec7d13c2db.tar.gz nixlib-2d51cceda419f47ca03960728911cbec7d13c2db.tar.bz2 nixlib-2d51cceda419f47ca03960728911cbec7d13c2db.tar.lz nixlib-2d51cceda419f47ca03960728911cbec7d13c2db.tar.xz nixlib-2d51cceda419f47ca03960728911cbec7d13c2db.tar.zst nixlib-2d51cceda419f47ca03960728911cbec7d13c2db.zip |
libfm: switch to fresher vala
Diffstat (limited to 'pkgs/development')
-rw-r--r-- | pkgs/development/libraries/libfm/default.nix | 11 |
1 files 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; |