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: 65d3a1857629
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 7fa60a5e6e5a
Choose a head ref
  • 1 commit
  • 1 file changed
  • 1 contributor

Commits on Apr 5, 2020

  1. gpsprune: 19.2 -> 20

    @r-ryantm @rycee
    r-ryantm authored and rycee committed Apr 5, 2020
    Copy the full SHA
    7fa60a5 View commit details
Showing with 6 additions and 6 deletions.
  1. +6 −6 pkgs/applications/misc/gpsprune/default.nix
12 changes: 6 additions & 6 deletions pkgs/applications/misc/gpsprune/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
{ fetchurl, stdenv, makeDesktopItem, makeWrapper, unzip, jre8 }:
{ fetchurl, stdenv, makeDesktopItem, makeWrapper, unzip, jdk11 }:

stdenv.mkDerivation rec {
pname = "gpsprune";
version = "19.2";
version = "20";

src = fetchurl {
url = "https://activityworkshop.net/software/gpsprune/gpsprune_${version}.jar";
sha256 = "1q2kpkkh75b9l1x7fkmv88s8k84gzcdnrg5sgf8ih0zrp49lawg9";
sha256 = "1i9p6h98azgradrrkcwx18zwz4c6zkxp4bfykpa2imi1z3ry5q2b";
};

nativeBuildInputs = [ makeWrapper ];
buildInputs = [ jre8 ];
buildInputs = [ jdk11 ];

desktopItem = makeDesktopItem {
name = "gpsprune";
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
buildCommand = ''
mkdir -p $out/bin $out/share/java
cp -v $src $out/share/java/gpsprune.jar
makeWrapper ${jre8}/bin/java $out/bin/gpsprune \
makeWrapper ${jdk11}/bin/java $out/bin/gpsprune \
--add-flags "-jar $out/share/java/gpsprune.jar"
mkdir -p $out/share/applications
cp $desktopItem/share/applications"/"* $out/share/applications
@@ -35,7 +35,7 @@ stdenv.mkDerivation rec {

meta = with stdenv.lib; {
description = "Application for viewing, editing and converting GPS coordinate data";
homepage = https://activityworkshop.net/software/gpsprune/;
homepage = "https://activityworkshop.net/software/gpsprune/";
license = licenses.gpl2Plus;
maintainers = [ maintainers.rycee ];
platforms = platforms.all;