nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-26 08:53:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

qmapshack: 1.15.0 → 1.15.1

Browse Source
This commit is contained in:
Nikolay Korotkiy 2020-11-27 12:05:04 +03:00
parent 215337d484
commit 92672cfff8
No known key found for this signature in database
GPG Key ID: D1DE6D7F693663A5
2 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkgs/applications/misc/qmapshack/default.nix → pkgs/applications/gis/qmapshack/default.nix
View File

@ -3,13 +3,13 @@
mkDerivation rec { mkDerivation rec {
pname = "qmapshack"; pname = "qmapshack";
version = "1.15.0"; version = "1.15.1";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "Maproom"; owner = "Maproom";
repo = pname; repo = pname;
rev = "V_${version}"; rev = "V_${version}";
sha256 = "157bssrbwcc1w58b0v60jb3wrjf2ig4z6z6crjnpvflkqj5p8vwy"; sha256 = "1q8qczp9bgk3dzdswb1x64fcn3xg339s0yx31nablb518hcb8jkr";
}; };
nativeBuildInputs = [ cmake ]; nativeBuildInputs = [ cmake ];
@ -22,8 +22,6 @@ mkDerivation rec {
"-DLIBQUAZIP_LIBRARY=${quazip}/lib/libquazip.so" "-DLIBQUAZIP_LIBRARY=${quazip}/lib/libquazip.so"
]; ];
enableParallelBuilding = true;
patches = [ patches = [
"${src}/FindPROJ4.patch" "${src}/FindPROJ4.patch"
"${src}/FindQuaZip5.patch" "${src}/FindQuaZip5.patch"
@ -36,7 +34,7 @@ mkDerivation rec {
meta = with lib; { meta = with lib; {
homepage = "https://github.com/Maproom/qmapshack"; homepage = "https://github.com/Maproom/qmapshack";
description = "Consumer grade GIS software"; description = "Consumer grade GIS software";
license = licenses.gpl3; license = licenses.gpl3Plus;
maintainers = with maintainers; [ dotlambda sikmir ]; maintainers = with maintainers; [ dotlambda sikmir ];
platforms = with platforms; linux; platforms = with platforms; linux;
}; };

2
pkgs/top-level/all-packages.nix
View File

@ -23365,7 +23365,7 @@ in
garmindev = callPackage ../applications/misc/qlandkartegt/garmindev.nix {}; 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 { qmediathekview = libsForQt5.callPackage ../applications/video/qmediathekview {
boost = boost17x; boost = boost17x;