Skip to content
This repository was archived by the owner on Apr 12, 2021. It is now read-only.
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs-channels
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: d8e6050fcb84
Choose a base ref
...
head repository: NixOS/nixpkgs-channels
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 4f5c57745c98
Choose a head ref
  • 2 commits
  • 1 file changed
  • 1 contributor

Commits on Feb 29, 2020

  1. libyamlcpp: don't use multiple outputs 

    This package uses CMake's install(EXPORT ...) command which assumes that
libraries are installed in the same location as the CMake files.

(cherry picked from commit bdbbe6f)
    @lopsided98 @veprbl
    lopsided98 authored and veprbl committed Feb 29, 2020
    Copy the full SHA
    7f4770a View commit details

  2. libyamlcpp: actually build shared libraries (#81051) 

    (cherry picked from commit be41f70)
    @lopsided98 @veprbl
    lopsided98 authored and veprbl committed Feb 29, 2020
    Copy the full SHA
    4f5c577 View commit details
Showing with 6 additions and 1 deletion.
  1. +6 −1 pkgs/development/libraries/libyaml-cpp/default.nix
7 changes: 6 additions & 1 deletion pkgs/development/libraries/libyaml-cpp/default.nix
View file
Original file line number Diff line number Diff line change
@@ -11,7 +11,12 @@ stdenv.mkDerivation rec {
sha256 = "0ykkxzxcwwiv8l8r697gyqh1nl582krpvi7m7l6b40ijnk4pw30s";
};

outputs = [ "out" "dev" ];
# 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 ];