dev/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

graphviz: remove xorg null override

Browse Source
This commit is contained in:
Sandro Jäckel 2021-11-04 23:11:54 +01:00
parent 1ab1b4561d
commit 41892fdd64
No known key found for this signature in database
GPG Key ID: 3AF5A43A3EECC2E5
2 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
pkgs/tools/graphics/graphviz/base.nix
View File

@ -2,7 +2,8 @@
{ lib, stdenv, fetchFromGitLab, autoreconfHook, pkg-config, cairo, expat, flex { lib, stdenv, fetchFromGitLab, autoreconfHook, pkg-config, cairo, expat, flex
, fontconfig, gd, gettext, gts, libdevil, libjpeg, libpng, libtool, pango, bash , fontconfig, gd, gettext, gts, libdevil, libjpeg, libpng, libtool, pango, bash
, bison, fetchpatch, xorg, ApplicationServices, python3 }: , bison, fetchpatch, xorg, ApplicationServices, python3, withXorg ? true
}:
let let
inherit (lib) optional optionals optionalString; inherit (lib) optional optionals optionalString;
@ -12,7 +13,7 @@ let
name = "CVE-2018-10196.patch"; name = "CVE-2018-10196.patch";
url = "https://gitlab.com/graphviz/graphviz/uploads/30f8f0b00e357c112ac35fb20241604a/p.diff"; url = "https://gitlab.com/graphviz/graphviz/uploads/30f8f0b00e357c112ac35fb20241604a/p.diff";
sha256 = "074qx6ch9blrnlilmz7p96fkiz2va84x2fbqdza5k4808rngirc7"; sha256 = "074qx6ch9blrnlilmz7p96fkiz2va84x2fbqdza5k4808rngirc7";
excludes = ["tests/*"]; # we don't run them and they don't apply excludes = [ "tests/*" ]; # we don't run them and they don't apply
}; };
# the patch needs a small adaption for older versions # the patch needs a small adaption for older versions
patchToUse = if lib.versionAtLeast version "2.37" then raw_patch else patchToUse = if lib.versionAtLeast version "2.37" then raw_patch else
@ -51,12 +52,12 @@ stdenv.mkDerivation {
buildInputs = [ buildInputs = [
libpng libjpeg expat fontconfig gd gts libdevil pango bash libpng libjpeg expat fontconfig gd gts libdevil pango bash
] ++ optionals (xorg != null) (with xorg; [ libXrender libXaw libXpm ]) ] ++ optionals withXorg (with xorg; [ libXrender libXaw libXpm ])
++ optionals (stdenv.isDarwin) [ ApplicationServices ]; ++ optionals stdenv.isDarwin [ ApplicationServices ];
hardeningDisable = [ "fortify" ]; hardeningDisable = [ "fortify" ];
CPPFLAGS = lib.optionalString (xorg != null && stdenv.isDarwin) CPPFLAGS = lib.optionalString (withXorg && stdenv.isDarwin)
"-I${cairo.dev}/include/cairo"; "-I${cairo.dev}/include/cairo";
configureFlags = [ configureFlags = [
@ -81,7 +82,7 @@ stdenv.mkDerivation {
preAutoreconf = "./autogen.sh"; preAutoreconf = "./autogen.sh";
postFixup = optionalString (xorg != null) '' postFixup = optionalString withXorg ''
substituteInPlace $out/bin/dotty --replace '`which lefty`' $out/bin/lefty substituteInPlace $out/bin/dotty --replace '`which lefty`' $out/bin/lefty
substituteInPlace $out/bin/vimdot \ substituteInPlace $out/bin/vimdot \
--replace /usr/bin/vi '$(command -v vi)' \ --replace /usr/bin/vi '$(command -v vi)' \

2
pkgs/top-level/all-packages.nix
View File

@ -5893,7 +5893,7 @@ with pkgs;
}; };
graphviz-nox = graphviz.override { graphviz-nox = graphviz.override {
xorg = null; withXorg = false;
libdevil = libdevil-nox; libdevil = libdevil-nox;
}; };