cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

sparrow: fix .desktop file

Browse source
This commit is contained in:
Emmanuel Rosa 2023-04-23 18:43:15 -04:00
parent 25e1b2bbef
commit 5ae84c1335
2 changed files with 10 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
pkgs/applications/blockchains/sparrow/default.nix
View file

@ -167,9 +167,9 @@ stdenv.mkDerivation rec {
desktopItems = [ desktopItems = [
(makeDesktopItem { (makeDesktopItem {
name = "Sparrow"; name = "sparrow-desktop";
exec = pname; exec = "sparrow-desktop";
icon = pname; icon = "sparrow-desktop";
desktopName = "Sparrow Bitcoin Wallet"; desktopName = "Sparrow Bitcoin Wallet";
genericName = "Bitcoin Wallet"; genericName = "Bitcoin Wallet";
categories = [ "Finance" "Network" ]; categories = [ "Finance" "Network" ];
@ -187,7 +187,7 @@ stdenv.mkDerivation rec {
for n in 16 24 32 48 64 96 128 256; do for n in 16 24 32 48 64 96 128 256; do
size=$n"x"$n size=$n"x"$n
mkdir -p $out/hicolor/$size/apps mkdir -p $out/hicolor/$size/apps
convert lib/Sparrow.png -resize $size $out/hicolor/$size/apps/sparrow.png convert lib/Sparrow.png -resize $size $out/hicolor/$size/apps/sparrow-desktop.png
done; done;
''; '';
}; };
@ -197,9 +197,9 @@ stdenv.mkDerivation rec {
mkdir -p $out/bin $out mkdir -p $out/bin $out
ln -s ${sparrow-modules}/modules $out/lib ln -s ${sparrow-modules}/modules $out/lib
install -D -m 777 ${launcher} $out/bin/sparrow install -D -m 777 ${launcher} $out/bin/sparrow-desktop
substituteAllInPlace $out/bin/sparrow substituteAllInPlace $out/bin/sparrow-desktop
substituteInPlace $out/bin/sparrow --subst-var-by jdkModules ${jdk-modules} substituteInPlace $out/bin/sparrow-desktop --subst-var-by jdkModules ${jdk-modules}
mkdir -p $out/share/icons mkdir -p $out/share/icons
ln -s ${sparrow-icons}/hicolor $out/share/icons ln -s ${sparrow-icons}/hicolor $out/share/icons
@ -222,5 +222,6 @@ stdenv.mkDerivation rec {
license = licenses.asl20; license = licenses.asl20;
maintainers = with maintainers; [ emmanuelrosa _1000101 ]; maintainers = with maintainers; [ emmanuelrosa _1000101 ];
platforms = [ "x86_64-linux" ]; platforms = [ "x86_64-linux" ];
mainProgram = "sparrow-desktop";
}; };
} }

4
pkgs/applications/blockchains/sparrow/fhsenv.nix
View file

@ -4,9 +4,9 @@
}: }:
buildFHSEnv { buildFHSEnv {
name = "sparrow"; name = "sparrow-desktop";
runScript = "${sparrow-unwrapped}/bin/sparrow"; runScript = "${sparrow-unwrapped}/bin/sparrow-desktop";
targetPkgs = pkgs: with pkgs; [ targetPkgs = pkgs: with pkgs; [
sparrow-unwrapped sparrow-unwrapped