cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

mc: add x11Support option

Browse source
This commit is contained in:
Izorkin 2023-02-05 11:23:54 +03:00
parent 3ecafeb0df
commit 7e0126da2c
No known key found for this signature in database
GPG key ID: 1436C1B3F3679F09
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -6,7 +6,6 @@
, gpm , gpm
, file , file
, e2fsprogs , e2fsprogs
, libX11
, libICE , libICE
, perl , perl
, zip , zip
@ -17,6 +16,7 @@
, openssl , openssl
, coreutils , coreutils
, autoSignDarwinBinariesHook , autoSignDarwinBinariesHook
, x11Support ? true, libX11
# updater only # updater only
, writeScript , writeScript
@ -43,12 +43,12 @@ stdenv.mkDerivation rec {
gettext gettext
glib glib
libICE libICE
libX11
libssh2 libssh2
openssl openssl
slang slang
zip zip
] ++ lib.optionals (!stdenv.isDarwin) [ e2fsprogs gpm ]; ] ++ lib.optional x11Support [ libX11 ]
++ lib.optionals (!stdenv.isDarwin) [ e2fsprogs gpm ];
enableParallelBuilding = true; enableParallelBuilding = true;
@ -71,7 +71,7 @@ stdenv.mkDerivation rec {
--replace /bin/cat ${coreutils}/bin/cat --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 # libX11.so is loaded dynamically so autopatch doesn't detect it
patchelf \ patchelf \
--add-needed ${libX11}/lib/libX11.so \ --add-needed ${libX11}/lib/libX11.so \