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

Merge pull request #25435 from volth/far2l-desktop

Browse Source 
far2l: add .desktop file
This commit is contained in:
Joachim F 2017-06-05 19:17:26 +01:00 committed by GitHub
commit d2ac9b192a
1 changed files with 20 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
pkgs/applications/misc/far2l/default.nix
View File

@ -1,19 +1,19 @@
{ stdenv, fetchFromGitHub, makeWrapper, cmake, pkgconfig, wxGTK30, glib, pcre, m4, bash, { stdenv, fetchFromGitHub, makeWrapper, cmake, pkgconfig, wxGTK30, glib, pcre, m4, bash,
xdg_utils, xterm, gvfs, zip, unzip, gzip, bzip2, gnutar, p7zip, xz }: xdg_utils, gvfs, zip, unzip, gzip, bzip2, gnutar, p7zip, xz, imagemagick }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
rev = "c2f2b89db31b1c3cb9bed53267873f4cd7bc996d"; rev = "ab240373f69824c56e9255d452b689cff3b1ecfb";
build = "2017-03-18-${builtins.substring 0 10 rev}"; build = "2017-05-09-${builtins.substring 0 10 rev}";
name = "far2l-2.1.${build}"; name = "far2l-2.1.${build}";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "elfmz"; owner = "elfmz";
repo = "far2l"; repo = "far2l";
rev = rev; rev = rev;
sha256 = "1172ajg4n8g4ag14b6nb9lclwh2r6v7ccndmvhnj066w35ixnqgb"; sha256 = "1b6w6xhja3xkfzhrdy8a8qpbhxws75khm1zhwz8sc8la9ykd541q";
}; };
nativeBuildInputs = [ cmake pkgconfig m4 makeWrapper ]; nativeBuildInputs = [ cmake pkgconfig m4 makeWrapper imagemagick ];
buildInputs = [ wxGTK30 glib pcre ]; buildInputs = [ wxGTK30 glib pcre ];
@ -23,8 +23,7 @@ stdenv.mkDerivation rec {
substituteInPlace far2l/bootstrap/open.sh \ substituteInPlace far2l/bootstrap/open.sh \
--replace 'gvfs-trash' '${gvfs}/bin/gvfs-trash' --replace 'gvfs-trash' '${gvfs}/bin/gvfs-trash'
substituteInPlace far2l/bootstrap/open.sh \ substituteInPlace far2l/bootstrap/open.sh \
--replace 'xdg-open' '${xdg_utils}/bin/xdg-open' \ --replace 'xdg-open' '${xdg_utils}/bin/xdg-open'
--replace 'xterm' '${xterm}/bin/xterm'
substituteInPlace far2l/vtcompletor.cpp \ substituteInPlace far2l/vtcompletor.cpp \
--replace '"/bin/bash"' '"${bash}/bin/bash"' --replace '"/bin/bash"' '"${bash}/bin/bash"'
substituteInPlace multiarc/src/formats/zip/zip.cpp \ substituteInPlace multiarc/src/formats/zip/zip.cpp \
@ -41,12 +40,20 @@ stdenv.mkDerivation rec {
''; '';
installPhase = '' installPhase = ''
mkdir -p $out/{bin,share} mkdir -p $out/bin $out/share/applications $out/share/icons/hicolor/scalable/apps
rm install/{far2l_askpass,far2l_sudoapp} cp -dpR install $out/share/far2l
mv install/far2l $out/bin/far2l mv $out/share/far2l/far2l $out/bin/
mv install $out/share/far2l ln -s -r --force $out/bin/far2l $out/share/far2l/far2l_askpass
ln -s -r $out/bin/far2l $out/share/far2l/far2l_askpass ln -s -r --force $out/bin/far2l $out/share/far2l/far2l_sudoapp
ln -s -r $out/bin/far2l $out/share/far2l/far2l_sudoapp
sed "s,/usr/bin/,$out/bin/," ../far2l/DE/far2l.desktop > $out/share/applications/far2l.desktop
cp ../far2l/DE/icons/hicolor/1024x1024/apps/far2l.svg $out/share/icons/hicolor/scalable/apps/
convert -size 128x128 ../far2l/DE/icons/far2l.svg $out/share/icons/far2l.png
for size in 16x16 24x24 32x32 48x48 64x64 72x72 96x96 128x128 192x192 256x256 512x512 1024x1024; do
mkdir -p $out/share/icons/hicolor/$size/apps
convert -size $size ../far2l/DE/icons/hicolor/$size/apps/far2l.svg $out/share/icons/hicolor/$size/apps/far2l.png
done
''; '';
stripDebugList = "bin share"; stripDebugList = "bin share";