diff options
author | 7c6f434c <7c6f434c@mail.ru> | 2022-12-10 15:12:13 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-12-10 15:12:13 +0000 |
commit | 60aa3fa6d7bc6ebbd1ad704ef8b3dbd28a115ae3 (patch) | |
tree | 95f393bf381329d12c3fb2127aa843a0bd3f000b /pkgs/applications | |
parent | 69b6d5a5f283219f6734f79cc739d9b3622d3173 (diff) | |
parent | 15c39787d83adb20b4f7a4619aa044f4e517fdbb (diff) | |
download | nixlib-60aa3fa6d7bc6ebbd1ad704ef8b3dbd28a115ae3.tar nixlib-60aa3fa6d7bc6ebbd1ad704ef8b3dbd28a115ae3.tar.gz nixlib-60aa3fa6d7bc6ebbd1ad704ef8b3dbd28a115ae3.tar.bz2 nixlib-60aa3fa6d7bc6ebbd1ad704ef8b3dbd28a115ae3.tar.lz nixlib-60aa3fa6d7bc6ebbd1ad704ef8b3dbd28a115ae3.tar.xz nixlib-60aa3fa6d7bc6ebbd1ad704ef8b3dbd28a115ae3.tar.zst nixlib-60aa3fa6d7bc6ebbd1ad704ef8b3dbd28a115ae3.zip |
Merge pull request #205484 from trofi/monotoneViz-without-xlibsWrapper
monotoneViz: use xorg.* packages directly instead of xlibsWrapper ind…
Diffstat (limited to 'pkgs/applications')
-rw-r--r-- | pkgs/applications/version-management/monotone-viz/default.nix | 4 | ||||
-rw-r--r-- | pkgs/applications/version-management/monotone-viz/graphviz-2.0.nix | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/pkgs/applications/version-management/monotone-viz/default.nix b/pkgs/applications/version-management/monotone-viz/default.nix index 3c92a93851bf..20edc2af502b 100644 --- a/pkgs/applications/version-management/monotone-viz/default.nix +++ b/pkgs/applications/version-management/monotone-viz/default.nix @@ -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 diff --git a/pkgs/applications/version-management/monotone-viz/graphviz-2.0.nix b/pkgs/applications/version-management/monotone-viz/graphviz-2.0.nix index e3c48c5724f7..05a0abe93c52 100644 --- a/pkgs/applications/version-management/monotone-viz/graphviz-2.0.nix +++ b/pkgs/applications/version-management/monotone-viz/graphviz-2.0.nix @@ -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"; |