diff options
author | Jan Tojnar <jtojnar@gmail.com> | 2018-12-25 14:55:33 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-12-25 14:55:33 +0100 |
commit | 3b19fa97455081f26c675cf001e8decc5f9c14ca (patch) | |
tree | affb1bb0c9e6683c0b97dda7ce8bdfc0e1cd8381 /pkgs | |
parent | 8b795576001cb169d61f0cf4a87d5c54a88dfa90 (diff) | |
parent | 6efc5245d3f64481deac38ee429722f8cea055f4 (diff) | |
download | nixlib-3b19fa97455081f26c675cf001e8decc5f9c14ca.tar nixlib-3b19fa97455081f26c675cf001e8decc5f9c14ca.tar.gz nixlib-3b19fa97455081f26c675cf001e8decc5f9c14ca.tar.bz2 nixlib-3b19fa97455081f26c675cf001e8decc5f9c14ca.tar.lz nixlib-3b19fa97455081f26c675cf001e8decc5f9c14ca.tar.xz nixlib-3b19fa97455081f26c675cf001e8decc5f9c14ca.tar.zst nixlib-3b19fa97455081f26c675cf001e8decc5f9c14ca.zip |
Merge pull request #52823 from r-ryantm/auto-update/pcmanfm
pcmanfm: 1.3.0 -> 1.3.1
Diffstat (limited to 'pkgs')
-rw-r--r-- | pkgs/applications/misc/pcmanfm/default.nix | 6 | ||||
-rw-r--r-- | pkgs/development/libraries/libfm/default.nix | 14 | ||||
-rw-r--r-- | pkgs/development/libraries/menu-cache/default.nix | 4 |
3 files changed, 15 insertions, 9 deletions
diff --git a/pkgs/applications/misc/pcmanfm/default.nix b/pkgs/applications/misc/pcmanfm/default.nix index a77b2d17ecb4..2649c7cbd6a9 100644 --- a/pkgs/applications/misc/pcmanfm/default.nix +++ b/pkgs/applications/misc/pcmanfm/default.nix @@ -7,10 +7,10 @@ let inherit (stdenv.lib) optional; in stdenv.mkDerivation rec { - name = "pcmanfm-1.3.0"; + name = "pcmanfm-1.3.1"; src = fetchurl { url = "mirror://sourceforge/pcmanfm/${name}.tar.xz"; - sha256 = "1ywgfyklms5hqkapsbjps4kyx20ac0d1qk16ww74yagkyfdkwsas"; + sha256 = "0mb8hg76x1z0szdyl0w7jpz0bdblc6a29is1vvnh79z37qxh8138"; }; buildInputs = [ glib gtk libfm' libX11 pango gnome3.defaultIconTheme ]; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { configureFlags = optional withGtk3 "--with-gtk=3"; meta = with stdenv.lib; { - homepage = http://blog.lxde.org/?cat=28/; + homepage = https://blog.lxde.org/category/pcmanfm/; license = licenses.gpl2Plus; description = "File manager with GTK+ interface"; maintainers = [ maintainers.ttuegel ]; diff --git a/pkgs/development/libraries/libfm/default.nix b/pkgs/development/libraries/libfm/default.nix index 796c03dab5ee..a0323481be9a 100644 --- a/pkgs/development/libraries/libfm/default.nix +++ b/pkgs/development/libraries/libfm/default.nix @@ -9,23 +9,29 @@ stdenv.mkDerivation rec { name = if extraOnly then "libfm-extra-${version}" else "libfm-${version}"; - version = "1.3.0.2"; + version = "1.3.1"; src = fetchurl { url = "mirror://sourceforge/pcmanfm/libfm-${version}.tar.xz"; - sha256 = "0wkwbi1nyvqza3r1dhrq846axiiq0fy0dqgngnagh76fjrwnzl0q"; + sha256 = "1r6gl49xrykldwz8y4h2s7gjarxigg3bbkrj0gphxjj1vr5j9ccn"; }; nativeBuildInputs = [ vala pkgconfig intltool ]; buildInputs = [ glib gtk pango ] ++ optional (!extraOnly) menu-cache; - configureFlags = optional extraOnly "--with-extra-only" + configureFlags = [ + "--sysconfdir=/etc" + ] ++ optional extraOnly "--with-extra-only" ++ optional withGtk3 "--with-gtk=3"; + installFlags = [ + "sysconfdir=${placeholder "out"}/etc" + ]; + enableParallelBuilding = true; meta = with stdenv.lib; { - homepage = http://blog.lxde.org/?cat=28/; + homepage = https://blog.lxde.org/category/pcmanfm/; license = licenses.lgpl21Plus; description = "A glib-based library for file management"; maintainers = [ maintainers.ttuegel ]; diff --git a/pkgs/development/libraries/menu-cache/default.nix b/pkgs/development/libraries/menu-cache/default.nix index c92b6a4e7287..d64b7f123127 100644 --- a/pkgs/development/libraries/menu-cache/default.nix +++ b/pkgs/development/libraries/menu-cache/default.nix @@ -14,9 +14,9 @@ stdenv.mkDerivation { buildInputs = [ glib libfm-extra ]; meta = with stdenv.lib; { - homepage = http://blog.lxde.org/?tag=menu-cache; - license = licenses.gpl2Plus; description = "Library to read freedesktop.org menu files"; + homepage = https://blog.lxde.org/tag/menu-cache/; + license = licenses.gpl2Plus; maintainers = [ maintainers.ttuegel ]; platforms = platforms.linux ++ platforms.darwin; }; |