Skip to content
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
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 3bc76218a307
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: e64c3abd2173
Choose a head ref
  • 2 commits
  • 1 file changed
  • 1 contributor

Commits on Oct 22, 2019

  1. srt: Fix wrong srt.pc include path. Fixes #70872. 

    Fix copied from:

    https://github.com/NixOS/nixpkgs/blob/1230fc8674439df5a90fe4c1ea740256ef9906e4/pkgs/development/compilers/hhvm/default.nix#L41-L44

Signed-off-by: Niklas Hambüchen <mail@nh2.me>
    @nh2
    nh2 committed Oct 22, 2019

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    rycee Robert Helgesson
    GPG key ID: 36BDAA14C2797E89
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    f7b53c0 View commit details

Commits on Oct 30, 2019

  1. Merge pull request #71669 from nh2/issue-70872-srt-wrong-cmake-pc-inc… 

    …lude-path

srt: Fix wrong `srt.pc` include path
    @nh2
    nh2 authored Oct 30, 2019
    Copy the full SHA
    e64c3ab View commit details
Showing with 4 additions and 0 deletions.
  1. +4 −0 pkgs/development/libraries/srt/default.nix
4 changes: 4 additions & 0 deletions pkgs/development/libraries/srt/default.nix
View file
Original file line number Diff line number Diff line change
@@ -18,6 +18,10 @@ stdenv.mkDerivation rec {
buildInputs = [ openssl ];

cmakeFlags = [
# the cmake package does not handle absolute CMAKE_INSTALL_INCLUDEDIR correctly
# (setting it to an absolute path causes include files to go to $out/$out/include,
# because the absolute path is interpreted with root at $out).
"-DCMAKE_INSTALL_INCLUDEDIR=include"
# TODO Remove this when https://github.com/Haivision/srt/issues/538 is fixed and available to nixpkgs
# Workaround for the fact that srt incorrectly disables GNUInstallDirs when LIBDIR is specified,
# see https://github.com/NixOS/nixpkgs/pull/54463#discussion_r249878330