diff options
| author | Arseniy Seroka <jagajaga@users.noreply.github.com> | 2016-06-26 20:13:50 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-06-26 20:13:50 +0300 |
| commit | 6664d8998c000d667dcf8379bded644c1c30764a (patch) | |
| tree | 03afc89b9d3cd01bb9b9abe846bd445f50cedab9 /pkgs | |
| parent | 4fb72b2fd3767c17e653b7804db141179fdf1aa4 (diff) | |
| parent | d576729099728b2efa08baee0d3bb0f51c5ac537 (diff) | |
| download | nixlib-6664d8998c000d667dcf8379bded644c1c30764a.tar nixlib-6664d8998c000d667dcf8379bded644c1c30764a.tar.gz nixlib-6664d8998c000d667dcf8379bded644c1c30764a.tar.bz2 nixlib-6664d8998c000d667dcf8379bded644c1c30764a.tar.lz nixlib-6664d8998c000d667dcf8379bded644c1c30764a.tar.xz nixlib-6664d8998c000d667dcf8379bded644c1c30764a.tar.zst nixlib-6664d8998c000d667dcf8379bded644c1c30764a.zip | |
Merge pull request #16520 from womfoo/merkaartor
merkaartor: 0.18.1 -> 0.18.2
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/applications/misc/merkaartor/default.nix | 18 |
1 files changed, 11 insertions, 7 deletions
diff --git a/pkgs/applications/misc/merkaartor/default.nix b/pkgs/applications/misc/merkaartor/default.nix index 5954316e50fe..3882f679cae4 100644 --- a/pkgs/applications/misc/merkaartor/default.nix +++ b/pkgs/applications/misc/merkaartor/default.nix @@ -1,15 +1,19 @@ -{ stdenv, fetchurl, qt4, qmake4Hook, boost, proj, gdal_1_11 }: +{ stdenv, fetchFromGitHub, qt4, qmake4Hook, boost, proj, gdal, sqlite, pkgconfig }: stdenv.mkDerivation rec { - name = "merkaartor-0.18.1"; - src = fetchurl { - url = "http://merkaartor.be/attachments/download/301/merkaartor-0.18.1.tar.bz2"; - sha256 = "17qk45pmlxqigla1915dvn9pp91y85d2bkcaap4g3m8mk1crcsix"; + name = "merkaartor-${version}"; + version = "0.18.2"; + + src = fetchFromGitHub { + owner = "openstreetmap"; + repo = "merkaartor"; + rev = version; + sha256 = "1a8kzrc9w0b2a2zgw9dbbi15jy9ynv6nf2sg3k4dbh7f1s2ajx9l"; }; - buildInputs = [ qt4 boost proj gdal_1_11 ]; + buildInputs = [ qt4 boost proj gdal sqlite ]; - nativeBuildInputs = [ qmake4Hook ]; + nativeBuildInputs = [ qmake4Hook pkgconfig ]; meta = { description = "An openstreetmap editor"; |