Unverified Commit f538320e authored by Nikolay Korotkiy's avatar Nikolay Korotkiy
Browse files

merkaartor: migrate to by-name

parent 5d65b513

pkgs/applications/misc/merkaartor/default.nix→pkgs/by-name/me/merkaartor/package.nix

+3 −7
Original line number Diff line number Diff line
@@ -3,14 +3,10 @@ 
, fetchFromGitHub

, cmake

, pkg-config

, qttools

, wrapQtAppsHook

, gdal

, proj

, protobuf

, qtnetworkauth

, qtsvg

, qtwebengine

, qt5

, withGeoimage ? true, exiv2

, withGpsdlib ? (!stdenv.isDarwin), gpsd

, withLibproxy ? false, libproxy
@@ -28,9 +24,9 @@ stdenv.mkDerivation rec { 
    hash = "sha256-oxLGhIE1qJ9+GOztD1HvrLGRGVO3gyy7Rc6CyzKTFec=";

  };



  nativeBuildInputs = [ cmake pkg-config qttools wrapQtAppsHook ];

  nativeBuildInputs = [ cmake pkg-config qt5.qttools qt5.wrapQtAppsHook ];



  buildInputs = [ gdal proj protobuf qtnetworkauth qtsvg qtwebengine ]

  buildInputs = [ gdal proj protobuf qt5.qtnetworkauth qt5.qtsvg qt5.qtwebengine ]

    ++ lib.optional withGeoimage exiv2

    ++ lib.optional withGpsdlib gpsd

    ++ lib.optional withLibproxy libproxy

pkgs/top-level/all-packages.nix

+0 −2
Original line number Diff line number Diff line
@@ -31661,8 +31661,6 @@ with pkgs; 














  mercurialFull = mercurial.override { fullBuild = true; };



























  merkaartor = libsForQt5.callPackage ../applications/misc/merkaartor { };



























  mepo = callPackage ../applications/misc/mepo { };





























  meshcentral = callPackage ../tools/admin/meshcentral { };