diff options
| author | Tobias Mayer <tobim@fastmail.fm> | 2019-12-16 13:04:53 +0100 |
|---|---|---|
| committer | Tobias Mayer <tobim@fastmail.fm> | 2019-12-29 10:57:16 +0100 |
| commit | d567c7e49768f001de428573777ad5cd0265092c (patch) | |
| tree | 77eaaa08464e34dee55aa0f29e431e8983f1f9df /pkgs | |
| parent | 15fb93ac4f9f56d71efe3ff3891b9b5d62d88fe8 (diff) | |
| download | nixpkgs-d567c7e49768f001de428573777ad5cd0265092c.tar nixpkgs-d567c7e49768f001de428573777ad5cd0265092c.tar.gz nixpkgs-d567c7e49768f001de428573777ad5cd0265092c.tar.bz2 nixpkgs-d567c7e49768f001de428573777ad5cd0265092c.tar.lz nixpkgs-d567c7e49768f001de428573777ad5cd0265092c.tar.xz nixpkgs-d567c7e49768f001de428573777ad5cd0265092c.tar.zst nixpkgs-d567c7e49768f001de428573777ad5cd0265092c.zip | |
glog: add pkgsStatic support
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/development/libraries/glog/default.nix | 8 | ||||
| -rw-r--r-- | pkgs/top-level/static.nix | 3 |
2 files changed, 8 insertions, 3 deletions
diff --git a/pkgs/development/libraries/glog/default.nix b/pkgs/development/libraries/glog/default.nix index 792217043da..7809dc08842 100644 --- a/pkgs/development/libraries/glog/default.nix +++ b/pkgs/development/libraries/glog/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, fetchpatch, autoreconfHook, perl }: +{ stdenv, lib, fetchFromGitHub, fetchpatch, cmake, perl, static ? false }: stdenv.mkDerivation rec { pname = "glog"; @@ -20,13 +20,15 @@ stdenv.mkDerivation rec { }) ]; - nativeBuildInputs = [ autoreconfHook ]; + nativeBuildInputs = [ cmake ]; + + cmakeFlags = [ "-DBUILD_SHARED_LIBS=${if static then "OFF" else "ON"}" ]; checkInputs = [ perl ]; doCheck = false; # fails with "Mangled symbols (28 out of 380) found in demangle.dm" meta = with stdenv.lib; { - homepage = https://github.com/google/glog; + homepage = "https://github.com/google/glog"; license = licenses.bsd3; description = "Library for application-level logging"; platforms = platforms.unix; diff --git a/pkgs/top-level/static.nix b/pkgs/top-level/static.nix index 17000e8eced..74c4b838ccc 100644 --- a/pkgs/top-level/static.nix +++ b/pkgs/top-level/static.nix @@ -176,6 +176,9 @@ in { gmp = super.gmp.override { withStatic = true; }; + glog = super.glog.override { + static = true; + }; cdo = super.cdo.override { enable_all_static = true; }; |