diff options
author | Arseniy Seroka <ars.seroka@gmail.com> | 2015-05-05 02:58:33 +0300 |
---|---|---|
committer | Arseniy Seroka <ars.seroka@gmail.com> | 2015-05-05 02:59:25 +0300 |
commit | eaa5e2309f8de5320ce00e0af1158f5e0573f56c (patch) | |
tree | 3b3a038a852b483628c91f67f5bf3b2d6b6aed37 /pkgs | |
parent | b7aeeee0436f6d0902d5ae5af068644d5252846e (diff) | |
download | nixlib-eaa5e2309f8de5320ce00e0af1158f5e0573f56c.tar nixlib-eaa5e2309f8de5320ce00e0af1158f5e0573f56c.tar.gz nixlib-eaa5e2309f8de5320ce00e0af1158f5e0573f56c.tar.bz2 nixlib-eaa5e2309f8de5320ce00e0af1158f5e0573f56c.tar.lz nixlib-eaa5e2309f8de5320ce00e0af1158f5e0573f56c.tar.xz nixlib-eaa5e2309f8de5320ce00e0af1158f5e0573f56c.tar.zst nixlib-eaa5e2309f8de5320ce00e0af1158f5e0573f56c.zip |
spacefm: update and add dep
Diffstat (limited to 'pkgs')
-rw-r--r-- | pkgs/applications/misc/spacefm/default.nix | 36 | ||||
-rw-r--r-- | pkgs/development/libraries/ffmpegthumbnailer/default.nix | 31 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 2 |
3 files changed, 54 insertions, 15 deletions
diff --git a/pkgs/applications/misc/spacefm/default.nix b/pkgs/applications/misc/spacefm/default.nix index b88e4c567cc1..ea7663c24069 100644 --- a/pkgs/applications/misc/spacefm/default.nix +++ b/pkgs/applications/misc/spacefm/default.nix @@ -1,30 +1,36 @@ -{ pkgs, fetchurl, stdenv, gtk3, udev, desktop_file_utils, shared_mime_info -, intltool, pkgconfig, makeWrapper -}: +{ pkgs, fetchurl, stdenv, gtk3, udev, desktop_file_utils, shared_mime_info , intltool, pkgconfig, makeWrapper, ffmpegthumbnailer, jmtpfs, ifuse, lsof, udisks }: -let - version = "0.9.2"; - -in stdenv.mkDerivation rec { +stdenv.mkDerivation rec { name = "spacefm-${version}"; + version = "1.0.1"; src = fetchurl { - url = "https://github.com/IgnorantGuru/spacefm/blob/pkg/${version}/${name}.tar.xz?raw=true"; - sha256 = "3767137d74aa78597ffb42a6121784e91a4276efcd5d718b3793b9790f82268c"; + url = "https://github.com/IgnorantGuru/spacefm/archive/${version}.tar.gz"; + sha256 = "0mps6akwzr4mkljgywpimwgqf6ajnd7gq615877h20wyjf4h46vz"; }; - buildInputs = [ gtk3 udev desktop_file_utils shared_mime_info intltool pkgconfig makeWrapper ]; + configureFlags = [ + "--with-bash-path=${pkgs.bash}/bin/bash" + "--with-preferable-sudo=${pkgs.sudo}/bin/sudo" + ]; + + buildInputs = [ gtk3 udev desktop_file_utils shared_mime_info intltool pkgconfig makeWrapper ffmpegthumbnailer jmtpfs ifuse lsof udisks ]; preFixup = '' wrapProgram "$out/bin/spacefm" \ --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH" ''; - meta = { - description = "Multi-panel tabbed file and desktop manager for Linux with built-in VFS, udev- or HAL-based device manager, customizable menu system, and bash integration"; - platforms = pkgs.lib.platforms.linux; - license = pkgs.lib.licenses.gpl3; + meta = with stdenv.lib; { + description = "A multi-panel tabbed file manager"; + longDescription = "Multi-panel tabbed file and desktop manager for Linux + with built-in VFS, udev- or HAL-based device manager, + customizable menu system, and bash integration + "; + homepage = http://ignorantguru.github.io/spacefm/; + platforms = platforms.linux; + license = licenses.gpl3; + maintainers = [ maintainers.jagajaga ]; }; } - diff --git a/pkgs/development/libraries/ffmpegthumbnailer/default.nix b/pkgs/development/libraries/ffmpegthumbnailer/default.nix new file mode 100644 index 000000000000..df1c532f6330 --- /dev/null +++ b/pkgs/development/libraries/ffmpegthumbnailer/default.nix @@ -0,0 +1,31 @@ +{ pkgs, fetchurl, stdenv, ffmpeg, cmake, libpng, pkgconfig +}: + +stdenv.mkDerivation rec { + name = "ffmpegthumbnailer-${version}"; + version = "2.0.10"; + + src = fetchurl { + url = "https://github.com/dirkvdb/ffmpegthumbnailer/releases/download/${version}/${name}.tar.bz2"; + sha256 = "0q7ws7ysw2rwr6ja8rhdjcc7x1hrlga7n514wi4lhw1yma32q0m3"; + }; + + buildInputs = [ ffmpeg cmake libpng pkgconfig ]; + + meta = with stdenv.lib; { + homepage = https://github.com/dirkvdb/ffmpegthumbnailer; + description = "A lightweight video thumbnailer"; + longDescription = "FFmpegthumbnailer is a lightweight video + thumbnailer that can be used by file managers to create thumbnails + for your video files. The thumbnailer uses ffmpeg o decode frames + from the video files, so supported videoformats depend on the + configuration flags of ffmpeg. + This thumbnailer was designed to be as fast and lightweight as possible. + The only dependencies are ffmpeg and libpng. + "; + platforms = platforms.linux; + license = licenses.gpl2; + maintainers = [ maintainers.jagajaga ]; + }; + +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a20248705f3c..0ed6fbdbb451 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5770,6 +5770,8 @@ let ffmpeg_2 = ffmpeg_2_5; ffmpeg = ffmpeg_2; + ffmpegthumbnailer = callPackage ../development/libraries/ffmpegthumbnailer { }; + ffms = callPackage ../development/libraries/ffms { }; fftw = callPackage ../development/libraries/fftw { }; |