diff options
| author | Arseniy Seroka <jagajaga@users.noreply.github.com> | 2016-07-05 13:02:43 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-07-05 13:02:43 +0300 |
| commit | 7926a98a7162d822e658bdaba171773c73a2992f (patch) | |
| tree | 76eafb0f9950a6980a014c737d71433c47883aa4 /pkgs | |
| parent | 0385abbc707e859dc16e146365dc8e072cf6caa3 (diff) | |
| parent | 1bbcd91b2ef0738709f7d955760a6624a9745fc2 (diff) | |
Merge pull request #16650 from RamKromberg/fix/spacefm-issue-15758
spacefm: sudo and gksu fixes #15758 and license update
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/applications/misc/spacefm/default.nix | 19 |
1 files changed, 13 insertions, 6 deletions
diff --git a/pkgs/applications/misc/spacefm/default.nix b/pkgs/applications/misc/spacefm/default.nix index f0c244af05e76..74466d667b3c6 100644 --- a/pkgs/applications/misc/spacefm/default.nix +++ b/pkgs/applications/misc/spacefm/default.nix @@ -1,6 +1,6 @@ -{ pkgs, fetchFromGitHub, stdenv, gtk3, udev, desktop_file_utils, shared_mime_info -, intltool, pkgconfig, wrapGAppsHook, ffmpegthumbnailer, jmtpfs, ifuse, lsof, udisks -, hicolor_icon_theme, adwaita-icon-theme }: +{ pkgs, fetchFromGitHub, stdenv, gtk3, udev, desktop_file_utils +, shared_mime_info, intltool, pkgconfig, wrapGAppsHook, ffmpegthumbnailer +, jmtpfs, ifuse, lsof, udisks, hicolor_icon_theme, adwaita-icon-theme }: stdenv.mkDerivation rec { name = "spacefm-${version}"; @@ -15,14 +15,21 @@ stdenv.mkDerivation rec { configureFlags = [ "--with-bash-path=${pkgs.bash}/bin/bash" - "--with-preferable-sudo=${pkgs.sudo}/bin/sudo" ]; preConfigure = '' configureFlags="$configureFlags --sysconfdir=$out/etc" ''; - buildInputs = [ gtk3 udev desktop_file_utils shared_mime_info intltool pkgconfig wrapGAppsHook ffmpegthumbnailer jmtpfs ifuse lsof udisks ]; + postInstall = '' + rm -f $out/etc/spacefm/spacefm.conf + ln -s /etc/spacefm/spacefm.conf $out/etc/spacefm/spacefm.conf + ''; + + buildInputs = [ + gtk3 udev desktop_file_utils shared_mime_info intltool pkgconfig + wrapGAppsHook ffmpegthumbnailer jmtpfs ifuse lsof udisks + ]; meta = with stdenv.lib; { description = "A multi-panel tabbed file manager"; @@ -33,7 +40,7 @@ stdenv.mkDerivation rec { ''; homepage = http://ignorantguru.github.io/spacefm/; platforms = platforms.linux; - license = licenses.gpl3; + license = licenses.gpl3Plus; maintainers = with maintainers; [ jagajaga obadz ]; }; } |