BoomMicrophone/nixpkgs-suyu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #205484 from trofi/monotoneViz-without-xlibsWrapper

Browse source 
monotoneViz: use xorg.* packages directly instead of xlibsWrapper ind…
This commit is contained in:
7c6f434c 2022-12-10 15:12:13 +00:00 committed by GitHub
commit 60aa3fa6d7
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
pkgs/applications/version-management/monotone-viz/default.nix
View file

@ -1,10 +1,10 @@
{ lib, stdenv, fetchurl, ocamlPackages, gnome2, pkg-config, makeWrapper, glib
, libtool, libpng, bison, expat, fontconfig, gd, pango, libjpeg, libwebp, xlibsWrapper, libXaw
, libtool, libpng, bison, expat, fontconfig, gd, pango, libjpeg, libwebp, libX11, libXaw
}:
# We need an old version of Graphviz for format compatibility reasons.
# This version is vulnerable, but monotone-viz will never feed it bad input.
let graphviz_2_0 = import ./graphviz-2.0.nix {
inherit lib stdenv fetchurl pkg-config xlibsWrapper libpng libjpeg expat libXaw
inherit lib stdenv fetchurl pkg-config libX11 libpng libjpeg expat libXaw
bison libtool fontconfig pango gd libwebp;
}; in
let inherit (gnome2) libgnomecanvas; in

6
pkgs/applications/version-management/monotone-viz/graphviz-2.0.nix
View file

@ -2,7 +2,7 @@
, stdenv
, fetchurl
, pkg-config
, xlibsWrapper
, libX11
, libpng
, libjpeg
, expat
@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ pkg-config ];
buildInputs = [
xlibsWrapper
libX11
libpng
libjpeg
expat
@ -52,7 +52,7 @@ stdenv.mkDerivation rec {
"--with-ltdl-include=${libtool}/include"
"--with-ltdl-lib=${libtool.lib}/lib"
]
++ lib.optional (xlibsWrapper == null) "--without-x";
++ lib.optional (libX11 == null) "--without-x";
meta = {
description = "A program for visualising graphs";