diff options
author | Ben Siraphob <bensiraphob@gmail.com> | 2021-01-15 16:19:50 +0700 |
---|---|---|
committer | Ben Siraphob <bensiraphob@gmail.com> | 2021-01-15 17:12:36 +0700 |
commit | 8c5d37129fc5097d9fb52e95fb07de75392d1c3c (patch) | |
tree | 40cfd341b87811008151e9ecf053cf7449574b98 /pkgs/tools/graphics/graphviz | |
parent | 94f36839357387fd711d17d762d88c69767f265b (diff) |
pkgs/tools: stdenv.lib -> lib
Diffstat (limited to 'pkgs/tools/graphics/graphviz')
-rw-r--r-- | pkgs/tools/graphics/graphviz/base.nix | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/pkgs/tools/graphics/graphviz/base.nix b/pkgs/tools/graphics/graphviz/base.nix index a3cdf9c6fc8ea..5162419e05dc5 100644 --- a/pkgs/tools/graphics/graphviz/base.nix +++ b/pkgs/tools/graphics/graphviz/base.nix @@ -7,7 +7,7 @@ assert stdenv.isDarwin -> ApplicationServices != null; let - inherit (stdenv.lib) optional optionals optionalString; + inherit (lib) optional optionals optionalString; raw_patch = # https://gitlab.com/graphviz/graphviz/issues/1367 CVE-2018-10196 fetchpatch { @@ -17,13 +17,13 @@ let excludes = ["tests/*"]; # we don't run them and they don't apply }; # the patch needs a small adaption for older versions - patchToUse = if stdenv.lib.versionAtLeast version "2.37" then raw_patch else + patchToUse = if lib.versionAtLeast version "2.37" then raw_patch else stdenv.mkDerivation { inherit (raw_patch) name; buildCommand = "sed s/dot_root/agroot/g ${raw_patch} > $out"; }; # 2.42 has the patch included - patches = optional (stdenv.lib.versionOlder version "2.42") patchToUse; + patches = optional (lib.versionOlder version "2.42") patchToUse; in stdenv.mkDerivation { @@ -46,13 +46,13 @@ stdenv.mkDerivation { hardeningDisable = [ "fortify" ]; - CPPFLAGS = stdenv.lib.optionalString (xorg != null && stdenv.isDarwin) + CPPFLAGS = lib.optionalString (xorg != null && stdenv.isDarwin) "-I${cairo.dev}/include/cairo"; configureFlags = [ "--with-ltdl-lib=${libtool.lib}/lib" "--with-ltdl-include=${libtool}/include" - ] ++ stdenv.lib.optional (xorg == null) "--without-x"; + ] ++ lib.optional (xorg == null) "--without-x"; inherit patches; |