Unverified Commit a0231c11 authored by figsoda's avatar figsoda Committed by GitHub
Browse files

Merge pull request #214705 from Izorkin/update-noxlibs 

nixos/no-x-libs: add mc
parents eaf9687f 686eda48

nixos/modules/config/no-x-libs.nix

+1 −0
Original line number Diff line number Diff line
@@ -46,6 +46,7 @@ with lib; 
      libextractor = super.libextractor.override { gtkSupport = false; };

      libva = super.libva-minimal;

      limesuite = super.limesuite.override { withGui = false; };

      mc = super.mc.override { x11Support = false; };

      mpv-unwrapped = super.mpv-unwrapped.override { sdl2Support = false; x11Support = false; };

      msmtp = super.msmtp.override { withKeyring = false; };

      neofetch = super.neofetch.override { x11Support = false; };

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

+4 −7
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;
@@ -66,12 +66,9 @@ stdenv.mkDerivation rec { 
  postPatch = ''

    substituteInPlace src/filemanager/ext.c \

      --replace /bin/rm ${coreutils}/bin/rm



    substituteInPlace misc/ext.d/misc.sh.in \

      --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 \