diff options
| author | Martin Weinelt <hexa@darmstadt.ccc.de> | 2022-04-16 00:52:15 +0200 |
|---|---|---|
| committer | Martin Weinelt <hexa@darmstadt.ccc.de> | 2022-04-16 00:52:15 +0200 |
| commit | 2bd8fc9378a01ecf28d119fd86737d9c368bc620 (patch) | |
| tree | 6fdeb5f753ae9a7c0fcb12162f06660987320bad /pkgs/development/libraries | |
| parent | 9ada55cec55cd7a1db6ac7a3bb93140961cfeac0 (diff) | |
| parent | d75710d82015b8ec2b11ba13fe23f9568ef76eb7 (diff) | |
| download | nixpkgs-2bd8fc9378a01ecf28d119fd86737d9c368bc620.tar nixpkgs-2bd8fc9378a01ecf28d119fd86737d9c368bc620.tar.gz nixpkgs-2bd8fc9378a01ecf28d119fd86737d9c368bc620.tar.bz2 nixpkgs-2bd8fc9378a01ecf28d119fd86737d9c368bc620.tar.lz nixpkgs-2bd8fc9378a01ecf28d119fd86737d9c368bc620.tar.xz nixpkgs-2bd8fc9378a01ecf28d119fd86737d9c368bc620.tar.zst nixpkgs-2bd8fc9378a01ecf28d119fd86737d9c368bc620.zip | |
Merge remote-tracking branch 'origin/master' into staging-next
Diffstat (limited to 'pkgs/development/libraries')
| -rw-r--r-- | pkgs/development/libraries/spdlog/default.nix | 23 | ||||
| -rw-r--r-- | pkgs/development/libraries/template-glib/default.nix | 4 |
2 files changed, 11 insertions, 16 deletions
diff --git a/pkgs/development/libraries/spdlog/default.nix b/pkgs/development/libraries/spdlog/default.nix index 6ef4f4af43a..5a21af12e33 100644 --- a/pkgs/development/libraries/spdlog/default.nix +++ b/pkgs/development/libraries/spdlog/default.nix @@ -1,7 +1,7 @@ -{ lib, stdenv, fetchFromGitHub, cmake, fmt_8, fetchpatch }: +{ lib, stdenv, fetchFromGitHub, cmake, fmt_8 }: let - generic = { version, sha256, patches ? [] }: + generic = { version, sha256 }: stdenv.mkDerivation { pname = "spdlog"; inherit version; @@ -13,8 +13,6 @@ let inherit sha256; }; - inherit patches; - nativeBuildInputs = [ cmake ]; # spdlog <1.3 uses a bundled version of fmt propagatedBuildInputs = lib.optional (lib.versionAtLeast version "1.3") fmt_8; @@ -38,7 +36,11 @@ let ''; doCheck = true; - preCheck = "export LD_LIBRARY_PATH=$(pwd)\${LD_LIBRARY_PATH:+:}$LD_LIBRARY_PATH"; + preCheck = if stdenv.isDarwin then '' + export DYLD_LIBRARY_PATH="$(pwd)''${DYLD_LIBRARY_PATH:+:}$DYLD_LIBRARY_PATH" + '' else '' + export LD_LIBRARY_PATH="$(pwd)''${LD_LIBRARY_PATH:+:}$LD_LIBRARY_PATH" + ''; meta = with lib; { description = "Very fast, header only, C++ logging library"; @@ -51,15 +53,8 @@ let in { spdlog_1 = generic { - version = "1.9.2"; - sha256 = "sha256-GSUdHtvV/97RyDKy8i+ticnSlQCubGGWHg4Oo+YAr8Y="; - patches = [ - # glibc 2.34 compat - (fetchpatch { - url = "https://github.com/gabime/spdlog/commit/d54b8e89c058f3cab2b32b3e9a2b49fd171d5895.patch"; - sha256 = "sha256-pb7cREF90GXb5Mbs8xFLQ+eLo6Xum13/xYa8JUgJlbI="; - }) - ]; + version = "1.10.0"; + sha256 = "sha256-c6s27lQCXKx6S1FhZ/LiKh14GnXMhZtD1doltU4Avws="; }; spdlog_0 = generic { diff --git a/pkgs/development/libraries/template-glib/default.nix b/pkgs/development/libraries/template-glib/default.nix index 375a7c3237a..23d2e8907ff 100644 --- a/pkgs/development/libraries/template-glib/default.nix +++ b/pkgs/development/libraries/template-glib/default.nix @@ -13,8 +13,8 @@ stdenv.mkDerivation { sha256 = "nsm3HgTU9csU91XveQYxzQtFwGA+Ecg2/Hz9niaM0Ho="; }; - buildInputs = [ meson ninja pkg-config gettext flex bison vala glib gtk-doc docbook_xsl docbook_xml_dtd_43 ]; - nativeBuildInputs = [ glib gobject-introspection ]; + nativeBuildInputs = [ meson ninja pkg-config gettext flex bison vala glib gtk-doc docbook_xsl docbook_xml_dtd_43 gobject-introspection ]; + buildInputs = [ glib ]; mesonFlags = [ "-Denable_gtk_doc=true" |