libfm: cosmetic changes

+20 -13
+20 -13
pkgs/development/libraries/libfm/default.nix
··· 1 - { lib, stdenv, fetchurl, glib, intltool, menu-cache, pango, pkg-config, vala 1 + { lib 2 + , stdenv 3 + , fetchurl 4 + , glib 5 + , intltool 6 + , menu-cache 7 + , pango 8 + , pkg-config 9 + , vala 2 10 , extraOnly ? false 3 - , withGtk3 ? false, gtk2, gtk3 }: 11 + , withGtk3 ? true , gtk3, gtk2 12 + }: 4 13 let 5 14 gtk = if withGtk3 then gtk3 else gtk2; 6 15 inherit (lib) optional; 7 16 in 8 17 stdenv.mkDerivation rec { 9 - name = if extraOnly 10 - then "libfm-extra-${version}" 11 - else "libfm-${version}"; 18 + pname = if extraOnly 19 + then "libfm-extra" 20 + else "libfm"; 12 21 version = "1.3.2"; 13 22 14 23 src = fetchurl { ··· 17 26 }; 18 27 19 28 nativeBuildInputs = [ vala pkg-config intltool ]; 20 - buildInputs = [ glib gtk pango ] ++ optional (!extraOnly) menu-cache; 29 + buildInputs = [ glib gtk pango ] 30 + ++ optional (!extraOnly) menu-cache; 21 31 22 - configureFlags = [ 23 - "--sysconfdir=/etc" 24 - ] ++ optional extraOnly "--with-extra-only" 25 - ++ optional withGtk3 "--with-gtk=3"; 32 + configureFlags = [ "--sysconfdir=/etc" ] 33 + ++ optional extraOnly "--with-extra-only" 34 + ++ optional withGtk3 "--with-gtk=3"; 26 35 27 - installFlags = [ 28 - "sysconfdir=${placeholder "out"}/etc" 29 - ]; 36 + installFlags = [ "sysconfdir=${placeholder "out"}/etc" ]; 30 37 31 38 # libfm-extra is pulled in by menu-cache and thus leads to a collision for libfm 32 39 postInstall = optional (!extraOnly) ''