p
/
nixexprs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Make fiv work on macOS when run from result dir

This commit is contained in:
Přemysl Eric Janouch 2023-06-29 20:32:43 +02:00
parent badd347b22
commit 0444cbcddf
Signed by: p
GPG Key ID: A0420B94F92B9493
2 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
fiv-master.nix
View File

@ -7,6 +7,7 @@ pkgs.stdenv.mkDerivation rec {
version = "master"; version = "master";
nativeBuildInputs = with pkgs; [ nativeBuildInputs = with pkgs; [
wrapGAppsHook
meson meson
pkg-config pkg-config
ninja ninja
@ -46,6 +47,9 @@ pkgs.stdenv.mkDerivation rec {
# Up for consideration: don't rely on shebangs at all. # Up for consideration: don't rely on shebangs at all.
patchPhase = '' patchPhase = ''
patchShebangs . patchShebangs .
# https://gitlab.gnome.org/GNOME/glib/-/issues/30240
ulimit -n 8192
''; '';
mesonFlags = [ mesonFlags = [
@ -67,6 +71,12 @@ pkgs.stdenv.mkDerivation rec {
"-Dgdk-pixbuf=disabled" "-Dgdk-pixbuf=disabled"
]; ];
preFixup = ''
gappsWrapperArgs+=(
--prefix PATH : $out/bin:${pkgs.lib.makeBinPath [ pkgs.exiftool ]}
)
'';
doCheck = true; doCheck = true;
meta = with pkgs.lib; { meta = with pkgs.lib; {

2
logdiag-master.nix
View File

@ -7,9 +7,9 @@ pkgs.stdenv.mkDerivation rec {
version = "master"; version = "master";
nativeBuildInputs = with pkgs; [ nativeBuildInputs = with pkgs; [
wrapGAppsHook
cmake cmake
pkg-config pkg-config
wrapGAppsHook
]; ];
buildInputs = with pkgs; [ buildInputs = with pkgs; [