ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-10-06 04:27:27 +03:00
Code Issues Projects Releases Wiki Activity

Merge pull request #325237 from TomaSajt/blockbench

Browse Source 
blockbench: 4.10.2 -> 4.10.4
This commit is contained in:
Franz Pletz 2024-07-09 17:35:20 +02:00 committed by GitHub
commit 44f78b07d2
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
pkgs/by-name/bl/blockbench/package.nix
View File

@ -7,7 +7,7 @@
imagemagick, imagemagick,
copyDesktopItems, copyDesktopItems,
makeDesktopItem, makeDesktopItem,
electron electron,
}: }:
let let
@ -15,13 +15,13 @@ let
in in
buildNpmPackage rec { buildNpmPackage rec {
pname = "blockbench"; pname = "blockbench";
version = "4.10.2"; version = "4.10.4";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "JannisX11"; owner = "JannisX11";
repo = "blockbench"; repo = "blockbench";
rev = "v${version}"; rev = "v${version}";
hash = "sha256-Ch+vPSvdqfJF2gNgZN2x5KSY1S1CYfHCyMyUf4W+Vn8="; hash = "sha256-TjT93nx52PxuHuW4NONTfI3G7+Dl0NFX2aKpZDEF8+8=";
}; };
nativeBuildInputs = nativeBuildInputs =
@ -31,7 +31,7 @@ buildNpmPackage rec {
copyDesktopItems copyDesktopItems
]; ];
npmDepsHash = "sha256-au6GzBTxPcYcqrPEnQ+yEhVRdAbiUa/Ocq7UCPdiox4="; npmDepsHash = "sha256-WkOn1bLJ9xmJdQcY6ak+hs/YW+crIXhTWA6tjMSVq9I=";
env.ELECTRON_SKIP_BINARY_DOWNLOAD = 1; env.ELECTRON_SKIP_BINARY_DOWNLOAD = 1;
@ -69,7 +69,7 @@ buildNpmPackage rec {
for size in 16 32 48 64 128 256 512; do for size in 16 32 48 64 128 256 512; do
mkdir -p $out/share/icons/hicolor/"$size"x"$size"/apps mkdir -p $out/share/icons/hicolor/"$size"x"$size"/apps
convert -resize "$size"x"$size" icon.png $out/share/icons/hicolor/"$size"x"$size"/apps/blockbench.png magick convert -resize "$size"x"$size" icon.png $out/share/icons/hicolor/"$size"x"$size"/apps/blockbench.png
done done
makeWrapper ${lib.getExe electron} $out/bin/blockbench \ makeWrapper ${lib.getExe electron} $out/bin/blockbench \
@ -101,8 +101,6 @@ buildNpmPackage rec {
homepage = "https://blockbench.net/"; homepage = "https://blockbench.net/";
license = lib.licenses.gpl3Only; license = lib.licenses.gpl3Only;
mainProgram = "blockbench"; mainProgram = "blockbench";
maintainers = with lib.maintainers; [ maintainers = with lib.maintainers; [ tomasajt ];
tomasajt
];
}; };
} }