diff options
| author | Weijia Wang <9713184+wegank@users.noreply.github.com> | 2023-04-16 18:48:22 +0300 |
|---|---|---|
| committer | Weijia Wang <9713184+wegank@users.noreply.github.com> | 2023-05-23 21:03:17 +0300 |
| commit | 13532826524693318930574c2ead977ff66a6a83 (patch) | |
| tree | 274d045b1b8ba8880395148dee751866f4c00b54 /pkgs/applications/misc/far2l | |
| parent | ff4881996e584d2b8462bef02f37face63ce75a8 (diff) | |
far2l: remove libSystem hack
Diffstat (limited to 'pkgs/applications/misc/far2l')
| -rw-r--r-- | pkgs/applications/misc/far2l/default.nix | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/pkgs/applications/misc/far2l/default.nix b/pkgs/applications/misc/far2l/default.nix index 2a23aac79f82c..ee17568c0118c 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"}") { |