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

Commits on Jan 7, 2018

  1. cmake: fix INSTALL_NAME_DIR for darwin libraries 

    When there's a lib output libraries won't be intalled to $prefix causing
output cycles.
    @LnL7
    LnL7 committed Jan 7, 2018
    Copy the full SHA
    6f10cfc View commit details

  2. brotli: remove darwin cmake fix

    @LnL7
    LnL7 committed Jan 7, 2018
    Copy the full SHA
    dc2ae3a View commit details

  3. Merge pull request #33382 from LnL7/darwin-cmake-outputs 

    cmake: fix hook for multiple outputs on darwin
    @LnL7
    LnL7 authored Jan 7, 2018
    Copy the full SHA
    84f9736 View commit details
Showing with 1 addition and 5 deletions.
  1. +1 −1 pkgs/development/tools/build-managers/cmake/setup-hook.sh
  2. +0 −4 pkgs/tools/compression/brotli/default.nix
2 changes: 1 addition & 1 deletion pkgs/development/tools/build-managers/cmake/setup-hook.sh
View file
Original file line number Diff line number Diff line change
@@ -43,7 +43,7 @@ cmakeConfigurePhase() {
# libraries are in a system path or in the same directory as the
# executable. This flag makes the shared library accessible from its
# nix/store directory.
cmakeFlags="-DCMAKE_INSTALL_NAME_DIR=$prefix/lib $cmakeFlags"
cmakeFlags="-DCMAKE_INSTALL_NAME_DIR=${!outputLib}/lib $cmakeFlags"
cmakeFlags="-DCMAKE_INSTALL_LIBDIR=${!outputLib}/lib $cmakeFlags"
cmakeFlags="-DCMAKE_INSTALL_INCLUDEDIR=${!outputDev}/include $cmakeFlags"

4 changes: 0 additions & 4 deletions pkgs/tools/compression/brotli/default.nix
View file
Original file line number Diff line number Diff line change
@@ -21,10 +21,6 @@ stdenv.mkDerivation rec {
# and the wonderful bazel BUILD file is already there (yay case-insensitivity?)
prePatch = "rm BUILD";

preConfigure = stdenv.lib.optionalString stdenv.isDarwin ''
cmakeFlagsArray+=("-DCMAKE_INSTALL_NAME_DIR=$lib/lib")
'';

meta = with stdenv.lib; {
inherit (src.meta) homepage;