diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2014-02-02 10:05:25 +0100 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2014-02-02 10:05:25 +0100 |
| commit | 6e2d3b98473523672b06ff5c90b5b387a029e566 (patch) | |
| tree | 4f53d0adf17553b40031d35fae3e6f263933fd93 /pkgs/applications/misc/merkaartor/default.nix | |
| parent | fcaa782b6ab7cd18b8ccca82cc6615b0b3c36b18 (diff) | |
| parent | 14a6a059f5863bfd9e7c69336baa8a918b41a86a (diff) | |
| download | nixpkgs-6e2d3b98473523672b06ff5c90b5b387a029e566.tar nixpkgs-6e2d3b98473523672b06ff5c90b5b387a029e566.tar.gz nixpkgs-6e2d3b98473523672b06ff5c90b5b387a029e566.tar.bz2 nixpkgs-6e2d3b98473523672b06ff5c90b5b387a029e566.tar.lz nixpkgs-6e2d3b98473523672b06ff5c90b5b387a029e566.tar.xz nixpkgs-6e2d3b98473523672b06ff5c90b5b387a029e566.tar.zst nixpkgs-6e2d3b98473523672b06ff5c90b5b387a029e566.zip | |
Merge master into x-updates
Diffstat (limited to 'pkgs/applications/misc/merkaartor/default.nix')
| -rw-r--r-- | pkgs/applications/misc/merkaartor/default.nix | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/pkgs/applications/misc/merkaartor/default.nix b/pkgs/applications/misc/merkaartor/default.nix index 6d10cbb8c21..e6636415b5e 100644 --- a/pkgs/applications/misc/merkaartor/default.nix +++ b/pkgs/applications/misc/merkaartor/default.nix @@ -1,17 +1,17 @@ -{stdenv, fetchurl, qt4, boost}: +{stdenv, fetchurl, qt4, boost, proj, gdal}: stdenv.mkDerivation rec { - name = "merkaartor-0.17.2"; + name = "merkaartor-0.18.1"; src = fetchurl { - url = "http://merkaartor.be/attachments/download/253/merkaartor-0.17.2.tar.bz2"; - sha256 = "0akhp9czzn39132mgj9h38nlh4l9ibzn3vh93bfs685zxyn4yps2"; + url = "http://merkaartor.be/attachments/download/301/merkaartor-0.18.1.tar.bz2"; + sha256 = "17qk45pmlxqigla1915dvn9pp91y85d2bkcaap4g3m8mk1crcsix"; }; configurePhase = '' qmake -makefile PREFIX=$out ''; - buildInputs = [ qt4 boost ]; + buildInputs = [ qt4 boost proj gdal ]; meta = { description = "An openstreetmap editor"; |