diff options
| author | Vladimír Čunát <v@cunat.cz> | 2020-01-14 19:07:47 +0100 |
|---|---|---|
| committer | Vladimír Čunát <v@cunat.cz> | 2020-01-14 19:08:48 +0100 |
| commit | 018e2972c71328395211bef1088e790fb2697b92 (patch) | |
| tree | cb0aed7bbfbb6103832c2f3d52e213854f7f3b7b /pkgs | |
| parent | ad2289ad11e1ec2213daa13f3758ffa53603fa15 (diff) | |
| parent | d48a99346c7f64d1de2ea9d1cb63ad356231650b (diff) | |
| download | nixpkgs-018e2972c71328395211bef1088e790fb2697b92.tar nixpkgs-018e2972c71328395211bef1088e790fb2697b92.tar.gz nixpkgs-018e2972c71328395211bef1088e790fb2697b92.tar.bz2 nixpkgs-018e2972c71328395211bef1088e790fb2697b92.tar.lz nixpkgs-018e2972c71328395211bef1088e790fb2697b92.tar.xz nixpkgs-018e2972c71328395211bef1088e790fb2697b92.tar.zst nixpkgs-018e2972c71328395211bef1088e790fb2697b92.zip | |
Merge #77682: glog: remove static flag
It was re-introduced by incorrect merge-conflict resolution.
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/development/libraries/glog/default.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/development/libraries/glog/default.nix b/pkgs/development/libraries/glog/default.nix index 891aa2965ae..aa846e41d55 100644 --- a/pkgs/development/libraries/glog/default.nix +++ b/pkgs/development/libraries/glog/default.nix @@ -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" |