Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: e6b7dcd1f675
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: c27fc66856af
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Jun 27, 2017

  1. geogebra: make language configurable

    @Ma27
    Ma27 committed Jun 27, 2017
    Copy the full SHA
    9516bbf View commit details

  2. Merge pull request #26904 from Ma27/geogebra/make-language-configurable 

    geogebra: make `language` configurable
    @joachifm
    joachifm authored Jun 27, 2017
    Copy the full SHA
    c27fc66 View commit details
Showing with 3 additions and 2 deletions.
  1. +3 −2 pkgs/applications/science/math/geogebra/default.nix
5 changes: 3 additions & 2 deletions pkgs/applications/science/math/geogebra/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{ stdenv, fetchurl, jre, makeDesktopItem, makeWrapper }:
{ stdenv, fetchurl, jre, makeDesktopItem, makeWrapper, language ? "en_US" }:

stdenv.mkDerivation rec {
name = "geogebra-${version}";
@@ -34,7 +34,8 @@ stdenv.mkDerivation rec {
makeWrapper "$out/libexec/geogebra/geogebra" "$out/bin/geogebra" \
--set JAVACMD "${jre}/bin/java" \
--set GG_PATH "$out/libexec/geogebra"
--set GG_PATH "$out/libexec/geogebra" \
--add-flags "--language=${language}"
install -Dm644 "${desktopItem}/share/applications/"* \
-t $out/share/applications/