diff options
author | Artturin <Artturin@artturin.com> | 2021-09-29 14:51:54 +0300 |
---|---|---|
committer | Artturin <Artturin@artturin.com> | 2021-10-13 22:54:53 +0300 |
commit | 7cda65b81a8883817f641b6f9922fc8e17ff2256 (patch) | |
tree | ddbdbdb95bccb03f0e8b6559a35a2300fcd3bad5 | |
parent | 5763d8c2f4dc60dbc85ddfc09a9bd22d220f2189 (diff) | |
download | nixpkgs-7cda65b81a8883817f641b6f9922fc8e17ff2256.tar nixpkgs-7cda65b81a8883817f641b6f9922fc8e17ff2256.tar.gz nixpkgs-7cda65b81a8883817f641b6f9922fc8e17ff2256.tar.bz2 nixpkgs-7cda65b81a8883817f641b6f9922fc8e17ff2256.tar.lz nixpkgs-7cda65b81a8883817f641b6f9922fc8e17ff2256.tar.xz nixpkgs-7cda65b81a8883817f641b6f9922fc8e17ff2256.tar.zst nixpkgs-7cda65b81a8883817f641b6f9922fc8e17ff2256.zip |
libyaml-cpp: apply patch to fix cmake variables
-rw-r--r-- | pkgs/development/libraries/libyaml-cpp/0.3.0.nix | 32 | ||||
-rw-r--r-- | pkgs/development/libraries/libyaml-cpp/default.nix | 16 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 9 |
3 files changed, 43 insertions, 14 deletions
diff --git a/pkgs/development/libraries/libyaml-cpp/0.3.0.nix b/pkgs/development/libraries/libyaml-cpp/0.3.0.nix new file mode 100644 index 00000000000..a465b047a11 --- /dev/null +++ b/pkgs/development/libraries/libyaml-cpp/0.3.0.nix @@ -0,0 +1,32 @@ +{ lib, stdenv, fetchFromGitHub, cmake }: + +stdenv.mkDerivation rec { + pname = "libyaml-cpp"; + version = "0.3.0"; + + src = fetchFromGitHub { + owner = "jbeder"; + repo = "yaml-cpp"; + rev = "release-${version}"; + sha256 = "sha256-pmgcULTXhl83+Wc8ZsGebnJ1t0XybHhUEJxDnEZE5x8="; + }; + + # implement https://github.com/jbeder/yaml-cpp/commit/52a1378e48e15d42a0b755af7146394c6eff998c + postPatch = '' + substituteInPlace CMakeLists.txt \ + --replace 'option(YAML_BUILD_SHARED_LIBS "Build Shared Libraries" OFF)' \ + 'option(YAML_BUILD_SHARED_LIBS "Build yaml-cpp shared library" ''${BUILD_SHARED_LIBS})' + ''; + + nativeBuildInputs = [ cmake ]; + + cmakeFlags = [ "-DBUILD_SHARED_LIBS=ON" "-DYAML_CPP_BUILD_TESTS=OFF" ]; + + meta = with lib; { + inherit (src.meta) homepage; + description = "A YAML parser and emitter for C++"; + license = licenses.mit; + platforms = platforms.unix; + maintainers = with maintainers; [ andir ]; + }; +} diff --git a/pkgs/development/libraries/libyaml-cpp/default.nix b/pkgs/development/libraries/libyaml-cpp/default.nix index ebfe53b2513..0c3eb363a6b 100644 --- a/pkgs/development/libraries/libyaml-cpp/default.nix +++ b/pkgs/development/libraries/libyaml-cpp/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, cmake }: +{ lib, stdenv, fetchFromGitHub, cmake, fetchpatch }: stdenv.mkDerivation rec { pname = "libyaml-cpp"; @@ -11,12 +11,14 @@ stdenv.mkDerivation rec { sha256 = "sha256-2tFWccifn0c2lU/U1WNg2FHrBohjx8CXMllPJCevaNk="; }; - # implement https://github.com/jbeder/yaml-cpp/commit/52a1378e48e15d42a0b755af7146394c6eff998c - postPatch = '' - substituteInPlace CMakeLists.txt \ - --replace 'option(YAML_BUILD_SHARED_LIBS "Build Shared Libraries" OFF)' \ - 'option(YAML_BUILD_SHARED_LIBS "Build yaml-cpp shared library" ''${BUILD_SHARED_LIBS})' - ''; + patches = [ + # https://github.com/jbeder/yaml-cpp/issues/774 + # https://github.com/jbeder/yaml-cpp/pull/1037 + (fetchpatch { + url = "https://github.com/jbeder/yaml-cpp/commit/4f48727b365962e31451cd91027bd797bc7d2ee7.patch"; + sha256 = "sha256-jarZAh7NgwL3xXzxijDiAQmC/EC2WYfNMkYHEIQBPhM="; + }) + ]; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2e54e5c1335..d3b2794f04b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -18152,17 +18152,12 @@ with pkgs; libyamlcpp = callPackage ../development/libraries/libyaml-cpp { }; + libyamlcpp_0_3 = callPackage ../development/libraries/libyaml-cpp/0.3.0.nix { }; + libcyaml = callPackage ../development/libraries/libcyaml { }; rang = callPackage ../development/libraries/rang { }; - libyamlcpp_0_3 = pkgs.libyamlcpp.overrideAttrs (oldAttrs: { - src = pkgs.fetchurl { - url = "https://github.com/jbeder/yaml-cpp/archive/release-0.3.0.tar.gz"; - sha256 = "12aszqw6svwlnb6nzhsbqhz3c7vnd5ahd0k6xlj05w8lm83hx3db"; - }; - }); - libykclient = callPackage ../development/libraries/libykclient { }; libykneomgr = callPackage ../development/libraries/libykneomgr { }; |