Unverified Commit 13d193b9 authored by Yohann Boniface's avatar Yohann Boniface Committed by GitHub
Browse files

osmscout-server: migrate to by-name (#492542)

parents e29f67f8 e7d1b864

pkgs/applications/misc/osmscout-server/default.nix→pkgs/by-name/os/osmscout-server/package.nix

+15 −14
Original line number Diff line number Diff line
@@ -3,22 +3,18 @@ 
  stdenv,

  fetchFromGitHub,

  pkg-config,

  qmake,

  qttools,

  wrapQtAppsHook,

  boost,

  kirigami2,

  libsForQt5,

  kyotocabinet,

  libmicrohttpd,

  libosmscout,

  libpostal,

  marisa,

  osrm-backend,

  protobuf,

  qtquickcontrols2,

  qtlocation,

  protobuf_21,

  sqlite,

  valhalla,

  abseil-cpp_202103,

}:



let
@@ -28,6 +24,11 @@ let 
    rev = "a45ea7c17b4a7f320e199b71436074bd624c9e15";

    hash = "sha256-Mq7Yd+y8M3JNG9BEScwVEmxGWYEy6gaNNSlTGgR9LB4=";

  };

  protobuf' = protobuf_21.override {

    abseil-cpp = abseil-cpp_202103.override {

      cxxStandard = "17";

    };

  };

in

stdenv.mkDerivation (finalAttrs: {

  pname = "osmscout-server";
@@ -42,16 +43,16 @@ stdenv.mkDerivation (finalAttrs: { 
  };



  nativeBuildInputs = [

    qmake

    libsForQt5.qmake

    pkg-config

    qttools

    wrapQtAppsHook

    libsForQt5.qttools

    libsForQt5.wrapQtAppsHook

  ];



  buildInputs = [

    kirigami2

    qtquickcontrols2

    qtlocation

    libsForQt5.kirigami2

    libsForQt5.qtquickcontrols2

    libsForQt5.qtlocation

    valhalla

    libosmscout

    osrm-backend
@@ -61,7 +62,7 @@ stdenv.mkDerivation (finalAttrs: { 
    marisa

    kyotocabinet

    boost

    protobuf

    protobuf'

    date

  ];

pkgs/top-level/all-packages.nix

+0 −8
Original line number Diff line number Diff line
@@ -10314,14 +10314,6 @@ with pkgs; 
    ocamlPackages = ocaml-ng.ocamlPackages_4_14;

  };



  osmscout-server = libsForQt5.callPackage ../applications/misc/osmscout-server {

    protobuf = protobuf_21.override {

      abseil-cpp = abseil-cpp_202103.override {

        cxxStandard = "17";

      };

    };

  };



  pantalaimon = callPackage ../applications/networking/instant-messengers/pantalaimon { };



  pantalaimon-headless = callPackage ../applications/networking/instant-messengers/pantalaimon {