Merge pull request #125682 from Xitian9/geogebra
This commit is contained in:
commit
015e07daf4
|
@ -1,7 +1,7 @@
|
||||||
{ lib, stdenv, fetchurl, jre, makeDesktopItem, makeWrapper, unzip, language ? "en_US" }:
|
{ lib, stdenv, fetchurl, jre, makeDesktopItem, makeWrapper, unzip, language ? "en_US" }:
|
||||||
let
|
let
|
||||||
pname = "geogebra";
|
pname = "geogebra";
|
||||||
version = "5-0-620-0";
|
version = "5-0-644-0";
|
||||||
|
|
||||||
srcIcon = fetchurl {
|
srcIcon = fetchurl {
|
||||||
url = "http://static.geogebra.org/images/geogebra-logo.svg";
|
url = "http://static.geogebra.org/images/geogebra-logo.svg";
|
||||||
|
@ -41,9 +41,9 @@ let
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
urls = [
|
urls = [
|
||||||
"https://download.geogebra.org/installers/5.0/GeoGebra-Linux-Portable-${version}.tar.bz2"
|
"https://download.geogebra.org/installers/5.0/GeoGebra-Linux-Portable-${version}.tar.bz2"
|
||||||
"http://web.archive.org/web/20210101213140/https://download.geogebra.org/installers/5.0/GeoGebra-Linux-Portable-${version}.tar.bz2"
|
"https://web.archive.org/web/20210604132513/https://download.geogebra.org/installers/5.0/GeoGebra-Linux-Portable-${version}.tar.bz2"
|
||||||
];
|
];
|
||||||
sha256 = "0v4r76b91cj0pns78gh3d432g2jlq2pz37lslg3fnnpvlfh25s9j";
|
sha256 = "dd992654175812d8770d94f063fc1430a743e8e0efcae03f51bf9a3a073c2522";
|
||||||
};
|
};
|
||||||
|
|
||||||
nativeBuildInputs = [ makeWrapper ];
|
nativeBuildInputs = [ makeWrapper ];
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
{ lib, stdenv, unzip, fetchurl, electron_6, makeWrapper, geogebra }:
|
{ lib, stdenv, unzip, fetchurl, electron_6, makeWrapper, geogebra }:
|
||||||
let
|
let
|
||||||
pname = "geogebra";
|
pname = "geogebra";
|
||||||
version = "6-0-631-0";
|
version = "6-0-644-0";
|
||||||
|
|
||||||
srcIcon = geogebra.srcIcon;
|
srcIcon = geogebra.srcIcon;
|
||||||
desktopItem = geogebra.desktopItem;
|
desktopItem = geogebra.desktopItem;
|
||||||
|
@ -18,9 +18,9 @@ let
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
urls = [
|
urls = [
|
||||||
"https://download.geogebra.org/installers/6.0/GeoGebra-Linux64-Portable-${version}.zip"
|
"https://download.geogebra.org/installers/6.0/GeoGebra-Linux64-Portable-${version}.zip"
|
||||||
"https://web.archive.org/web/20210406083122/https://download.geogebra.org/installers/6.0/GeoGebra-Linux64-Portable-${version}.zip"
|
"https://web.archive.org/web/20210604132845/https://download.geogebra.org/installers/6.0/GeoGebra-Linux64-Portable-${version}.zip"
|
||||||
];
|
];
|
||||||
sha256 = "1k4jxcvxxjxfrdghs4a29zpp4yid2vh1mfgp8xxr3qlzxnqv92ha";
|
sha256 = "bbe9e1a35abacfd560c0b7aa1ab975853e6adac08608bb70cd80261179e3f922";
|
||||||
};
|
};
|
||||||
|
|
||||||
dontConfigure = true;
|
dontConfigure = true;
|
||||||
|
|
Loading…
Reference in a new issue