mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-25 16:33:15 +00:00
Merge pull request #205697 from ckiee/blockbench-20221212
This commit is contained in:
commit
c51092ad75
@ -1,12 +1,12 @@
|
|||||||
{ lib, stdenv, fetchurl, appimageTools, makeWrapper, electron_16 }:
|
{ lib, stdenv, fetchurl, appimageTools, makeWrapper, electron_22 }:
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "blockbench-electron";
|
pname = "blockbench-electron";
|
||||||
version = "4.1.1";
|
version = "4.5.2";
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "https://github.com/JannisX11/blockbench/releases/download/v${version}/Blockbench_${version}.AppImage";
|
url = "https://github.com/JannisX11/blockbench/releases/download/v${version}/Blockbench_${version}.AppImage";
|
||||||
sha256 = "0mqdkjhmylrjjfrm05jv1967qqka5263fgcn9qzax08gcq93s18f";
|
sha256 = "sha256-uUgVBdYMCF31+L/FV4ADIpUdEAmnW59KfscQxUStPWM=";
|
||||||
name = "${pname}-${version}.AppImage";
|
name = "${pname}-${version}.AppImage";
|
||||||
};
|
};
|
||||||
|
|
||||||
@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
|
|||||||
'';
|
'';
|
||||||
|
|
||||||
postFixup = ''
|
postFixup = ''
|
||||||
makeWrapper ${electron_16}/bin/electron $out/bin/${pname} \
|
makeWrapper ${electron_22}/bin/electron $out/bin/${pname} \
|
||||||
--add-flags $out/share/${pname}/resources/app.asar \
|
--add-flags $out/share/${pname}/resources/app.asar \
|
||||||
--prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ stdenv.cc.cc ]}"
|
--prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ stdenv.cc.cc ]}"
|
||||||
'';
|
'';
|
||||||
@ -42,7 +42,7 @@ stdenv.mkDerivation rec {
|
|||||||
description = "A boxy 3D model editor powered by Electron";
|
description = "A boxy 3D model editor powered by Electron";
|
||||||
homepage = "https://blockbench.net/";
|
homepage = "https://blockbench.net/";
|
||||||
license = licenses.gpl3Only;
|
license = licenses.gpl3Only;
|
||||||
maintainers = [ maintainers.ckie ];
|
maintainers = with maintainers; [ ckie ];
|
||||||
platforms = [ "x86_64-linux" ];
|
platforms = [ "x86_64-linux" ];
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user