diff options
| author | Nikolay Korotkiy <sikmir@gmail.com> | 2020-11-27 12:05:04 +0300 |
|---|---|---|
| committer | Nikolay Korotkiy <sikmir@gmail.com> | 2020-11-27 12:32:55 +0300 |
| commit | 92672cfff81e2cc227b237037746ef296c551503 (patch) | |
| tree | 2765669e4b3faed5b85f8b017cabab027eff7596 | |
| parent | 215337d484db4d981bd88ecf241fae2a263eacf2 (diff) | |
qmapshack: 1.15.0 → 1.15.1
| -rw-r--r-- | pkgs/applications/gis/qmapshack/default.nix (renamed from pkgs/applications/misc/qmapshack/default.nix) | 8 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 2 |
2 files changed, 4 insertions, 6 deletions
diff --git a/pkgs/applications/misc/qmapshack/default.nix b/pkgs/applications/gis/qmapshack/default.nix index 1a8758955ceff..bc7d888e2c154 100644 --- a/pkgs/applications/misc/qmapshack/default.nix +++ b/pkgs/applications/gis/qmapshack/default.nix @@ -3,13 +3,13 @@ mkDerivation rec { pname = "qmapshack"; - version = "1.15.0"; + version = "1.15.1"; src = fetchFromGitHub { owner = "Maproom"; repo = pname; rev = "V_${version}"; - sha256 = "157bssrbwcc1w58b0v60jb3wrjf2ig4z6z6crjnpvflkqj5p8vwy"; + sha256 = "1q8qczp9bgk3dzdswb1x64fcn3xg339s0yx31nablb518hcb8jkr"; }; nativeBuildInputs = [ cmake ]; @@ -22,8 +22,6 @@ mkDerivation rec { "-DLIBQUAZIP_LIBRARY=${quazip}/lib/libquazip.so" ]; - enableParallelBuilding = true; - patches = [ "${src}/FindPROJ4.patch" "${src}/FindQuaZip5.patch" @@ -36,7 +34,7 @@ mkDerivation rec { meta = with lib; { homepage = "https://github.com/Maproom/qmapshack"; description = "Consumer grade GIS software"; - license = licenses.gpl3; + license = licenses.gpl3Plus; maintainers = with maintainers; [ dotlambda sikmir ]; platforms = with platforms; linux; }; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1ea78c5d10455..6aa71ede47839 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -23365,7 +23365,7 @@ in garmindev = callPackage ../applications/misc/qlandkartegt/garmindev.nix {}; - qmapshack = libsForQt514.callPackage ../applications/misc/qmapshack { }; + qmapshack = libsForQt5.callPackage ../applications/gis/qmapshack { }; qmediathekview = libsForQt5.callPackage ../applications/video/qmediathekview { boost = boost17x; |