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

Commits on Jan 14, 2020

  1. glog: remove static flag

    @tobim
    tobim committed Jan 14, 2020
    Copy the full SHA
    d48a993 View commit details

  2. Merge #77682: glog: remove static flag 

    It was re-introduced by incorrect merge-conflict resolution.
    @vcunat
    vcunat committed Jan 14, 2020
    Copy the full SHA
    018e297 View commit details
Showing with 2 additions and 2 deletions.
  1. +2 −2 pkgs/development/libraries/glog/default.nix
4 changes: 2 additions & 2 deletions 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, gflags, perl, static ? false }:
{ stdenv, lib, fetchFromGitHub, fetchpatch, cmake, gflags, perl }:

stdenv.mkDerivation rec {
pname = "glog";
@@ -30,7 +30,7 @@ stdenv.mkDerivation rec {

propagatedBuildInputs = [ gflags ];

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

checkInputs = [ perl ];
doCheck = false; # fails with "Mangled symbols (28 out of 380) found in demangle.dm"