public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #22073 from romildo/upd.pcmanfm

Browse Source 
{lib,pcman}fm: 1.2.4 -> 1.2.5
This commit is contained in:
Jörg Thalheim 2017-01-24 10:48:56 +01:00 committed by GitHub
commit 4785a19444
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,10 +1,10 @@
{ stdenv, fetchurl, glib, gtk2, intltool, libfm, libX11, pango, pkgconfig }: { stdenv, fetchurl, glib, gtk2, intltool, libfm, libX11, pango, pkgconfig }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "pcmanfm-1.2.4"; name = "pcmanfm-1.2.5";
src = fetchurl { src = fetchurl {
url = "mirror://sourceforge/pcmanfm/${name}.tar.xz"; url = "mirror://sourceforge/pcmanfm/${name}.tar.xz";
sha256 = "04z3vd9si24yi4c8calqncdpb9b6mbj4cs4f3fs86i6j05gvpk9q"; sha256 = "0rxdh0dfzc84l85c54blq42gczygq8adhr3l9hqzy1dp530cm1hc";
}; };
buildInputs = [ glib gtk2 intltool libfm libX11 pango pkgconfig ]; buildInputs = [ glib gtk2 intltool libfm libX11 pango pkgconfig ];

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

@ -1,4 +1,4 @@
{ stdenv, fetchurl, glib, gtk2, intltool, menu-cache, pango, pkgconfig, vala_0_23 { stdenv, fetchurl, glib, gtk2, intltool, menu-cache, pango, pkgconfig, vala_0_34
, extraOnly ? false }: , extraOnly ? false }:
let let
inherit (stdenv.lib) optional; inherit (stdenv.lib) optional;
@ -7,14 +7,14 @@ stdenv.mkDerivation rec {
name = if extraOnly name = if extraOnly
then "libfm-extra-${version}" then "libfm-extra-${version}"
else "libfm-${version}"; else "libfm-${version}";
version = "1.2.4"; version = "1.2.5";
src = fetchurl { src = fetchurl {
url = "mirror://sourceforge/pcmanfm/libfm-${version}.tar.xz"; url = "mirror://sourceforge/pcmanfm/libfm-${version}.tar.xz";
sha256 = "0bsh4p7h2glhxf1cc1lvbxyb4qy0y1zsnl9izf7vrldkikrgc13q"; sha256 = "0nlvfwh09gbq8bkbvwnw6iqr918rrs9gc9ljb9pjspyg408bn1n7";
}; };
buildInputs = [ glib gtk2 intltool pango pkgconfig vala_0_23 ] buildInputs = [ glib gtk2 intltool pango pkgconfig vala_0_34 ]
++ optional (!extraOnly) menu-cache; ++ optional (!extraOnly) menu-cache;
configureFlags = optional extraOnly "--with-extra-only"; configureFlags = optional extraOnly "--with-extra-only";