nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-04-13 06:07:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

far2l: remove libSystem hack

Browse Source
This commit is contained in:
Weijia Wang 2023-04-16 18:48:22 +03:00
parent ff4881996e
commit 1353282652
2 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pkgs/applications/misc/far2l/default.nix
View File

@ -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"}") {

2
pkgs/top-level/all-packages.nix
View File

@ -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 { };