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

Commits on Jan 12, 2020

  1. glog: fix on darwin, provide gflags (#77451)

    @tobim @veprbl
    tobim authored and veprbl committed Jan 12, 2020

    Unverified

    This commit is not signed, but one or more authors requires that any commit attributed to them is signed.
    Learn about vigilant mode
    Copy the full SHA
    2ac7d8f View commit details
Showing with 9 additions and 1 deletion.
  1. +9 −1 pkgs/development/libraries/glog/default.nix
10 changes: 9 additions & 1 deletion pkgs/development/libraries/glog/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{ stdenv, lib, fetchFromGitHub, fetchpatch, cmake, perl, static ? false }:
{ stdenv, lib, fetchFromGitHub, fetchpatch, cmake, gflags, perl, static ? false }:

stdenv.mkDerivation rec {
pname = "glog";
@@ -20,8 +20,16 @@ stdenv.mkDerivation rec {
})
];

postPatch = lib.optionalString stdenv.isDarwin ''
# A path clash on case-insensitive file systems blocks creation of the build directory.
# The file in question is specific to bazel and does not influence the build result.
rm BUILD
'';

nativeBuildInputs = [ cmake ];

propagatedBuildInputs = [ gflags ];

cmakeFlags = [ "-DBUILD_SHARED_LIBS=${if static then "OFF" else "ON"}" ];

checkInputs = [ perl ];