diff options
| author | Robert Helgesson <robert@rycee.net> | 2018-05-17 19:12:17 +0200 |
|---|---|---|
| committer | Robert Helgesson <robert@rycee.net> | 2018-05-17 19:12:17 +0200 |
| commit | 838bfaa8edf2c1224715eda00f143a5dc363e65a (patch) | |
| tree | be33ed0c579221cae3ffab2f9fccf707fe8d4ff8 /pkgs/applications | |
| parent | d7ac3818d3addea49eceebe175222b8357e32138 (diff) | |
| download | nixlib-838bfaa8edf2c1224715eda00f143a5dc363e65a.tar nixlib-838bfaa8edf2c1224715eda00f143a5dc363e65a.tar.gz nixlib-838bfaa8edf2c1224715eda00f143a5dc363e65a.tar.bz2 nixlib-838bfaa8edf2c1224715eda00f143a5dc363e65a.tar.lz nixlib-838bfaa8edf2c1224715eda00f143a5dc363e65a.tar.xz nixlib-838bfaa8edf2c1224715eda00f143a5dc363e65a.tar.zst nixlib-838bfaa8edf2c1224715eda00f143a5dc363e65a.zip | |
gpsbabel: remove use of phases
Also make use of `makeWrapper`.
Diffstat (limited to 'pkgs/applications')
| -rw-r--r-- | pkgs/applications/misc/gpsprune/default.nix | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/pkgs/applications/misc/gpsprune/default.nix b/pkgs/applications/misc/gpsprune/default.nix index 3c40457062bf..b6391d06eb92 100644 --- a/pkgs/applications/misc/gpsprune/default.nix +++ b/pkgs/applications/misc/gpsprune/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, makeDesktopItem, unzip, bash, jre8 }: +{ fetchurl, stdenv, makeDesktopItem, makeWrapper, unzip, bash, jre8 }: stdenv.mkDerivation rec { name = "gpsprune-${version}"; @@ -9,8 +9,7 @@ stdenv.mkDerivation rec { sha256 = "0n08fg55zgpfg1f6lq0n3ngi0n8af1r0rhmbnpik5mjng4m9g3x5"; }; - phases = [ "installPhase" ]; - + nativeBuildInputs = [ makeWrapper ]; buildInputs = [ jre8 ]; desktopItem = makeDesktopItem { @@ -23,15 +22,11 @@ stdenv.mkDerivation rec { categories = "Education;Geoscience;"; }; - installPhase = '' + buildCommand = '' mkdir -p $out/bin $out/share/java cp -v $src $out/share/java/gpsprune.jar - cat > $out/bin/gpsprune <<EOF - #!${bash}/bin/bash - exec ${jre8}/bin/java -jar $out/share/java/gpsprune.jar "\$@" - EOF - chmod 755 $out/bin/gpsprune - + makeWrapper ${jre8}/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 mkdir -p $out/share/pixmaps |