Unverified Commit 7e0126da authored by Izorkin's avatar Izorkin
Browse files

mc: add x11Support option

parent 3ecafeb0

pkgs/applications/file-managers/mc/default.nix

+4 −4
Original line number Diff line number Diff line
@@ -6,7 +6,6 @@ 
, gpm

, file

, e2fsprogs

, libX11

, libICE

, perl

, zip
@@ -17,6 +16,7 @@ 
, openssl

, coreutils

, autoSignDarwinBinariesHook

, x11Support ? true, libX11



# updater only

, writeScript
@@ -43,12 +43,12 @@ stdenv.mkDerivation rec { 
    gettext

    glib

    libICE

    libX11

    libssh2

    openssl

    slang

    zip

  ] ++ lib.optionals (!stdenv.isDarwin) [ e2fsprogs gpm ];

  ] ++ lib.optional x11Support [ libX11 ]

    ++ lib.optionals (!stdenv.isDarwin) [ e2fsprogs gpm ];



  enableParallelBuilding = true;
@@ -71,7 +71,7 @@ stdenv.mkDerivation rec { 
      --replace /bin/cat ${coreutils}/bin/cat

  '';



  postFixup = lib.optionalString (!stdenv.isDarwin) ''

  postFixup = lib.optionalString ((!stdenv.isDarwin) && x11Support) ''

    # libX11.so is loaded dynamically so autopatch doesn't detect it

    patchelf \

      --add-needed ${libX11}/lib/libX11.so \