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: c07857710b78
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 824d6d73dbd4
Choose a head ref
  • 1 commit
  • 1 file changed
  • 1 contributor

Commits on Mar 20, 2018

  1. zstd: Fix install name on macOS 

    It had an install name '/usr/local/lib/libzstd.1.dylib'.

(cherry picked from commit 7e44f19)
    @edolstra
    edolstra committed Mar 20, 2018
    Copy the full SHA
    824d6d7 View commit details
Showing with 3 additions and 0 deletions.
  1. +3 −0 pkgs/tools/compression/zstd/default.nix
3 changes: 3 additions & 0 deletions pkgs/tools/compression/zstd/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
{ stdenv, fetchFromGitHub, gnugrep
, fixDarwinDylibNames
, legacySupport ? false }:

stdenv.mkDerivation rec {
@@ -12,6 +13,8 @@ stdenv.mkDerivation rec {
owner = "facebook";
};

buildInputs = stdenv.lib.optional stdenv.isDarwin fixDarwinDylibNames;

makeFlags = [
"ZSTD_LEGACY_SUPPORT=${if legacySupport then "1" else "0"}"
];