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

Merge pull request #147202 from voidIess/u/geogebra_6_0_672_0

Browse source
This commit is contained in:
Sandro 2021-11-28 03:51:46 +01:00 committed by GitHub
commit 5d6a70c260
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
pkgs/applications/science/math/geogebra/geogebra6.nix
View file

@ -1,7 +1,7 @@
{ lib, stdenv, unzip, fetchurl, electron_6, makeWrapper, geogebra }: { lib, stdenv, unzip, fetchurl, electron, makeWrapper, geogebra }:
let let
pname = "geogebra"; pname = "geogebra";
version = "6-0-644-0"; version = "6-0-676-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/20210604132845/https://download.geogebra.org/installers/6.0/GeoGebra-Linux64-Portable-${version}.zip" "https://web.archive.org/web/20211123222708/https://download.geogebra.org/installers/6.0/GeoGebra-Linux64-Portable-${version}.zip"
]; ];
sha256 = "bbe9e1a35abacfd560c0b7aa1ab975853e6adac08608bb70cd80261179e3f922"; sha256 = "0wn90n2nd476rkf83gk9vvcpbjflkrvyri50pnmv52j76n023hmm";
}; };
dontConfigure = true; dontConfigure = true;
@ -38,7 +38,7 @@ let
installPhase = '' installPhase = ''
mkdir -p $out/libexec/geogebra/ $out/bin mkdir -p $out/libexec/geogebra/ $out/bin
cp -r GeoGebra-linux-x64/{resources,locales} "$out/" cp -r GeoGebra-linux-x64/{resources,locales} "$out/"
makeWrapper ${lib.getBin electron_6}/bin/electron $out/bin/geogebra --add-flags "$out/resources/app" makeWrapper ${lib.getBin electron}/bin/electron $out/bin/geogebra --add-flags "$out/resources/app"
install -Dm644 "${desktopItem}/share/applications/"* \ install -Dm644 "${desktopItem}/share/applications/"* \
-t $out/share/applications/ -t $out/share/applications/
@ -53,9 +53,9 @@ let
src = fetchurl { src = fetchurl {
urls = [ urls = [
"https://download.geogebra.org/installers/6.0/GeoGebra-Classic-6-MacOS-Portable-${version}.zip" "https://download.geogebra.org/installers/6.0/GeoGebra-Classic-6-MacOS-Portable-${version}.zip"
"https://web.archive.org/web/20210406084052/https://download.geogebra.org/installers/6.0/GeoGebra-Classic-6-MacOS-Portable-${version}.zip" "https://web.archive.org/web/20211124143625/https://download.geogebra.org/installers/6.0/GeoGebra-Classic-6-MacOS-Portable-${version}.zip"
]; ];
sha256 = "0fa680yyz4nry1xvb9v6qqh1mib6grff5d3p7d90nyjlv101p262"; sha256 = "1dwv2f94a1c2y10lmy0i66cafynalp7dkqgnpk4f0mk6pir2fdgj";
}; };
dontUnpack = true; dontUnpack = true;

4
pkgs/top-level/all-packages.nix
View file

@ -31859,7 +31859,9 @@ with pkgs;
gap-full = lowPrio (gap.override { packageSet = "full"; }); gap-full = lowPrio (gap.override { packageSet = "full"; });
geogebra = callPackage ../applications/science/math/geogebra { }; geogebra = callPackage ../applications/science/math/geogebra { };
geogebra6 = callPackage ../applications/science/math/geogebra/geogebra6.nix { }; geogebra6 = callPackage ../applications/science/math/geogebra/geogebra6.nix {
electron = electron_12;
};
maxima = callPackage ../applications/science/math/maxima { maxima = callPackage ../applications/science/math/maxima {
ecl = null; ecl = null;