diff options
| author | Peter Hoeg <peter@hoeg.com> | 2022-11-16 11:44:01 +0800 |
|---|---|---|
| committer | Peter Hoeg <peter@hoeg.com> | 2022-11-23 09:27:49 +0800 |
| commit | 091e6d7c69f3101501b91cecd35b0d200d9bd9f6 (patch) | |
| tree | af1749020ed861802e792adbe00071b3735c8339 /pkgs | |
| parent | d2b9c6691ec4ec20774bc1bda66e3503d9fc181c (diff) | |
| download | nixpkgs-091e6d7c69f3101501b91cecd35b0d200d9bd9f6.tar nixpkgs-091e6d7c69f3101501b91cecd35b0d200d9bd9f6.tar.gz nixpkgs-091e6d7c69f3101501b91cecd35b0d200d9bd9f6.tar.bz2 nixpkgs-091e6d7c69f3101501b91cecd35b0d200d9bd9f6.tar.lz nixpkgs-091e6d7c69f3101501b91cecd35b0d200d9bd9f6.tar.xz nixpkgs-091e6d7c69f3101501b91cecd35b0d200d9bd9f6.tar.zst nixpkgs-091e6d7c69f3101501b91cecd35b0d200d9bd9f6.zip | |
gpxsee: 11.6 -> 11.9
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/applications/misc/gpxsee/default.nix | 36 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 6 |
2 files changed, 36 insertions, 6 deletions
diff --git a/pkgs/applications/misc/gpxsee/default.nix b/pkgs/applications/misc/gpxsee/default.nix index d7177906287..8de8e30269a 100644 --- a/pkgs/applications/misc/gpxsee/default.nix +++ b/pkgs/applications/misc/gpxsee/default.nix @@ -1,16 +1,33 @@ -{ 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; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7c1fa43aa48..a319f0c306d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -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 { }; |