Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

monotoneViz: use xorg.* packages directly instead of xlibsWrapper ind… #205484

Merged
merged 1 commit into from
Dec 10, 2022
Merged

monotoneViz: use xorg.* packages directly instead of xlibsWrapper ind… #205484

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions pkgs/applications/version-management/monotone-viz/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
6 changes: 3 additions & 3 deletions pkgs/applications/version-management/monotone-viz/graphviz-2.0.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
, stdenv
, fetchurl
, pkg-config
, xlibsWrapper
, libX11
, libpng
, libjpeg
, expat
Expand All @@ -26,7 +26,7 @@ stdenv.mkDerivation rec {

nativeBuildInputs = [ pkg-config ];
buildInputs = [
xlibsWrapper
libX11
libpng
libjpeg
expat
Expand All @@ -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";
Expand Down