pyrox.dev / nixpkgs
lol
fork atom

far2l: remove libSystem hack

Weijia Wang 13532826 ff488199

+3 -6
unified split
+2 -5
pkgs/applications/misc/far2l/default.nix
··· 1 { lib, stdenv, fetchFromGitHub, makeWrapper, cmake, ninja, pkg-config, m4, bash 2 , xdg-utils, zip, unzip, gzip, bzip2, gnutar, p7zip, xz 3 - , IOKit, Carbon, Cocoa, AudioToolbox, OpenGL 4 , withTTYX ? true, libX11 5 , withGUI ? true, wxGTK32 6 , withUCD ? true, libuchardet ··· 35 ++ lib.optionals withNetRocks [ openssl libssh libnfs neon ] 36 ++ lib.optional (withNetRocks && !stdenv.isDarwin) samba # broken on darwin 37 ++ lib.optionals withPython (with python3Packages; [ python cffi debugpy pcpp ]) 38 - ++ lib.optionals stdenv.isDarwin [ IOKit Carbon Cocoa AudioToolbox OpenGL ]; 39 40 postPatch = '' 41 patchShebangs python/src/prebuild.sh ··· 43 --replace '"/bin/bash"' '"${bash}/bin/bash"' 44 substituteInPlace far2l/src/cfg/config.cpp \ 45 --replace '"/bin/bash"' '"${bash}/bin/bash"' 46 - '' + lib.optionalString stdenv.isDarwin '' 47 - substituteInPlace WinPort/src/Backend/WX/CMakeLists.txt \ 48 - --replace "-framework System" -lSystem 49 ''; 50 51 cmakeFlags = lib.mapAttrsToList (k: v: "-D${k}=${if v then "yes" else "no"}") {
··· 1 { lib, stdenv, fetchFromGitHub, makeWrapper, cmake, ninja, pkg-config, m4, bash 2 , xdg-utils, zip, unzip, gzip, bzip2, gnutar, p7zip, xz 3 + , IOKit, Carbon, Cocoa, AudioToolbox, OpenGL, System 4 , withTTYX ? true, libX11 5 , withGUI ? true, wxGTK32 6 , withUCD ? true, libuchardet ··· 35 ++ lib.optionals withNetRocks [ openssl libssh libnfs neon ] 36 ++ lib.optional (withNetRocks && !stdenv.isDarwin) samba # broken on darwin 37 ++ lib.optionals withPython (with python3Packages; [ python cffi debugpy pcpp ]) 38 + ++ lib.optionals stdenv.isDarwin [ IOKit Carbon Cocoa AudioToolbox OpenGL System ]; 39 40 postPatch = '' 41 patchShebangs python/src/prebuild.sh ··· 43 --replace '"/bin/bash"' '"${bash}/bin/bash"' 44 substituteInPlace far2l/src/cfg/config.cpp \ 45 --replace '"/bin/bash"' '"${bash}/bin/bash"' 46 ''; 47 48 cmakeFlags = lib.mapAttrsToList (k: v: "-D${k}=${if v then "yes" else "no"}") {
+1 -1
pkgs/top-level/all-packages.nix
··· 20221 20222 far2l = callPackage ../applications/misc/far2l { 20223 stdenv = if stdenv.cc.isClang then llvmPackages.stdenv else stdenv; 20224 - inherit (darwin.apple_sdk.frameworks) IOKit Carbon Cocoa AudioToolbox OpenGL; 20225 }; 20226 20227 farbfeld = callPackage ../development/libraries/farbfeld { };
··· 20221 20222 far2l = callPackage ../applications/misc/far2l { 20223 stdenv = if stdenv.cc.isClang then llvmPackages.stdenv else stdenv; 20224 + inherit (darwin.apple_sdk.frameworks) IOKit Carbon Cocoa AudioToolbox OpenGL System; 20225 }; 20226 20227 farbfeld = callPackage ../development/libraries/farbfeld { };