Commit 091e6d7c authored by Peter Hoeg's avatar Peter Hoeg
Browse files

gpxsee: 11.6 -> 11.9

parent d2b9c669

pkgs/applications/misc/gpxsee/default.nix

+31 −5
Original line number Diff line number Diff line 
{ lib, stdenv, fetchFromGitHub, nix-update-script, substituteAll

, qmake, qttools, qttranslations, qtlocation, qtpbfimageplugin, wrapQtAppsHook

{ lib

, stdenv

, fetchFromGitHub

, qmake

, nix-update-script

, substituteAll

, qtbase

, qttools

, qttranslations

, qtlocation ? null # qt5 only

, qtpositioning ? null # qt6 only

, qtpbfimageplugin

, qtsvg

, qt5compat ? null # qt6 only

, wrapQtAppsHook

}:



let

  isQt6 = lib.versions.major qtbase.version == "6";



in

stdenv.mkDerivation rec {

  pname = "gpxsee";

  version = "11.6";

  version = "11.9";



  src = fetchFromGitHub {

    owner = "tumic0";

    repo = "GPXSee";

    rev = version;

    hash = "sha256-kwEltkLcMCZlUJyE+nyy70WboVO1FgMw0cH1hxLVtKQ=";

    hash = "sha256-R/Kuk4nRJg3ozNNmzzNDnGcsmBmlk0g9d+F8JwLFz98=";

  };



  patches = (substituteAll {
@@ -19,7 +36,15 @@ stdenv.mkDerivation rec { 
    inherit qttranslations;

  });



  buildInputs = [ qtlocation qtpbfimageplugin ];

  buildInputs = [ qtpbfimageplugin ]

    ++ (if isQt6 then [

    qtbase

    qtpositioning

    qtsvg

    qt5compat

  ] else [

    qtlocation

  ]);



  nativeBuildInputs = [ qmake qttools wrapQtAppsHook ];
@@ -49,5 +74,6 @@ stdenv.mkDerivation rec { 
    license = licenses.gpl3Only;

    maintainers = with maintainers; [ womfoo sikmir ];

    platforms = platforms.unix;

    broken = isQt6 && stdenv.isDarwin;

  };

}

pkgs/top-level/all-packages.nix

+5 −1
Original line number Diff line number Diff line
@@ -29153,7 +29153,11 @@ with pkgs; 














  gpxlab = libsForQt5.callPackage ../applications/misc/gpxlab { };



























  gpxsee = libsForQt5.callPackage ../applications/misc/gpxsee { };













  gpxsee-qt5 = libsForQt5.callPackage ../applications/misc/gpxsee { };

























  gpxsee-qt6 = qt6Packages.callPackage ../applications/misc/gpxsee { };

























  gpxsee = gpxsee-qt5;





























  gspell = callPackage ../development/libraries/gspell { };