Unverified Commit 9cbba9c4 authored by K900's avatar K900 Committed by GitHub
Browse files

yaml-cpp: backport patch for CMake 4; {osm2xmap,proj_7,yaml-cpp_0_3}: drop (#443325)

parents fd6c07a0 798a52c3

pkgs/by-name/os/osm2xmap/package.nix

deleted100644 → 0
+0 −47
Original line number Diff line number Diff line 
{

  lib,

  stdenv,

  fetchFromGitHub,

  libroxml,

  proj_7,

  yaml-cpp_0_3,

  boost,

}:



stdenv.mkDerivation rec {

  pname = "osm2xmap";

  version = "2.0";



  src = fetchFromGitHub {

    sha256 = "1d3f18wzk240yp0q8i2vskhcfj5ar61s4hw83vgps0wr2aglph3w";

    repo = "osm2xmap";

    owner = "sembruk";

    rev = "v${version}";

  };



  makeFlags = [

    "GIT_VERSION=${version}"

    "GIT_TIMESTAMP="

    "SHAREDIR=${placeholder "out"}/share/osm2xmap/"

    "INSTALL_BINDIR=${placeholder "out"}/bin"

    "INSTALL_MANDIR=${placeholder "out"}/share/man/man1"

  ];



  env.NIX_CFLAGS_COMPILE = "-DACCEPT_USE_OF_DEPRECATED_PROJ_API_H";



  buildInputs = [

    libroxml

    proj_7

    yaml-cpp_0_3

    boost

  ];



  meta = with lib; {

    homepage = "https://github.com/sembruk/osm2xmap";

    description = "Converter from OpenStreetMap data format to OpenOrienteering Mapper format";

    license = licenses.gpl3;

    maintainers = [ maintainers.mpickering ];

    platforms = with lib.platforms; linux;

    mainProgram = "osm2xmap";

  };

}

pkgs/development/libraries/yaml-cpp/default.nix→pkgs/by-name/ya/yaml-cpp/package.nix

+9 −0
Original line number Diff line number Diff line
@@ -2,6 +2,7 @@ 
  lib,

  stdenv,

  fetchFromGitHub,

  fetchpatch,

  gitUpdater,

  cmake,

  static ? stdenv.hostPlatform.isStatic,
@@ -18,6 +19,14 @@ stdenv.mkDerivation rec { 
    hash = "sha256-J87oS6Az1/vNdyXu3L7KmUGWzU0IAkGrGMUUha+xDXI=";

  };



  patches = [

    (fetchpatch {

      name = "yaml-cpp-fix-cmake-4.patch";

      url = "https://github.com/jbeder/yaml-cpp/commit/c2680200486572baf8221ba052ef50b58ecd816e.patch";

      hash = "sha256-1kXRa+xrAbLEhcJxNV1oGHPmayj1RNIe6dDWXZA3mUA=";

    })

  ];



  strictDeps = true;



  nativeBuildInputs = [