diff --git a/pkgs/applications/misc/far2l/default.nix b/pkgs/applications/misc/far2l/default.nix index 2a23aac79f82..ee17568c0118 100644 --- a/pkgs/applications/misc/far2l/default.nix +++ b/pkgs/applications/misc/far2l/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchFromGitHub, makeWrapper, cmake, ninja, pkg-config, m4, bash , xdg-utils, zip, unzip, gzip, bzip2, gnutar, p7zip, xz -, IOKit, Carbon, Cocoa, AudioToolbox, OpenGL +, IOKit, Carbon, Cocoa, AudioToolbox, OpenGL, System , withTTYX ? true, libX11 , withGUI ? true, wxGTK32 , withUCD ? true, libuchardet @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { ++ lib.optionals withNetRocks [ openssl libssh libnfs neon ] ++ lib.optional (withNetRocks && !stdenv.isDarwin) samba # broken on darwin ++ lib.optionals withPython (with python3Packages; [ python cffi debugpy pcpp ]) - ++ lib.optionals stdenv.isDarwin [ IOKit Carbon Cocoa AudioToolbox OpenGL ]; + ++ lib.optionals stdenv.isDarwin [ IOKit Carbon Cocoa AudioToolbox OpenGL System ]; postPatch = '' patchShebangs python/src/prebuild.sh @@ -43,9 +43,6 @@ stdenv.mkDerivation rec { --replace '"/bin/bash"' '"${bash}/bin/bash"' substituteInPlace far2l/src/cfg/config.cpp \ --replace '"/bin/bash"' '"${bash}/bin/bash"' - '' + lib.optionalString stdenv.isDarwin '' - substituteInPlace WinPort/src/Backend/WX/CMakeLists.txt \ - --replace "-framework System" -lSystem ''; cmakeFlags = lib.mapAttrsToList (k: v: "-D${k}=${if v then "yes" else "no"}") { diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d97eb416919c..43ca9ca78092 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -20221,7 +20221,7 @@ with pkgs; far2l = callPackage ../applications/misc/far2l { stdenv = if stdenv.cc.isClang then llvmPackages.stdenv else stdenv; - inherit (darwin.apple_sdk.frameworks) IOKit Carbon Cocoa AudioToolbox OpenGL; + inherit (darwin.apple_sdk.frameworks) IOKit Carbon Cocoa AudioToolbox OpenGL System; }; farbfeld = callPackage ../development/libraries/farbfeld { };