diff options
author | Daiderd Jordan <daiderd@gmail.com> | 2018-11-06 18:54:06 +0100 |
---|---|---|
committer | Daiderd Jordan <daiderd@gmail.com> | 2018-11-06 18:54:06 +0100 |
commit | 2b76ad8fe7d849c6c08040dafaab12ed919beb41 (patch) | |
tree | 33527e342098377ad6cd8d597f14701a412b0ae9 /pkgs/servers/x11/xquartz | |
parent | f00a4af18fc7a3bae3e59b370554f82c882e3a42 (diff) |
xquartz: add cf-private
Undefined symbols for architecture x86_64: "_NSDefaultRunLoopMode", referenced from: _X11ApplicationMain in libXquartz.a(X11Application.o) "_OBJC_CLASS_$_NSArray", referenced from: objc-class-ref in libXquartz.a(X11Application.o) objc-class-ref in libXquartz.a(X11Controller.o) objc-class-ref in libxpbproxy.a(x-selection.o) "_OBJC_CLASS_$_NSData", referenced from: objc-class-ref in libxpbproxy.a(x-selection.o) "_OBJC_CLASS_$_NSDictionary", referenced from: objc-class-ref in libxpbproxy.a(x-selection.o) "_OBJC_CLASS_$_NSMutableArray", referenced from: objc-class-ref in libXquartz.a(X11Application.o) objc-class-ref in libXquartz.a(X11Controller.o) "_OBJC_CLASS_$_NSMutableDictionary", referenced from: objc-class-ref in libXquartz.a(X11Application.o) "_OBJC_CLASS_$_NSRunLoop", referenced from: objc-class-ref in libXquartz.a(X11Application.o) "_OBJC_CLASS_$_NSURL", referenced from: objc-class-ref in libXquartz.a(X11Application.o) "_OBJC_EHTYPE_$_NSException", referenced from: GCC_except_table29 in libxpbproxy.a(x-selection.o) ld: symbol(s) not found for architecture x86_64
Diffstat (limited to 'pkgs/servers/x11/xquartz')
-rw-r--r-- | pkgs/servers/x11/xquartz/default.nix | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/pkgs/servers/x11/xquartz/default.nix b/pkgs/servers/x11/xquartz/default.nix index 3fc7aaea9c935..8cb96d0ae39f4 100644 --- a/pkgs/servers/x11/xquartz/default.nix +++ b/pkgs/servers/x11/xquartz/default.nix @@ -1,6 +1,7 @@ -{ stdenv, lib, buildEnv, makeFontsConf, gnused, writeScript, xorg, bashInteractive, xterm, makeWrapper, ruby +{ stdenv, buildEnv, makeFontsConf, gnused, writeScript, xorg, bashInteractive, xterm, makeWrapper, ruby , quartz-wm, fontconfig, xlsfonts, xfontsel , ttf_bitstream_vera, freefont_ttf, liberation_ttf +, cf-private , shell ? "${bashInteractive}/bin/bash" }: @@ -97,7 +98,11 @@ let in stdenv.mkDerivation { name = "xquartz-${stdenv.lib.getVersion xorg.xorgserver}"; - buildInputs = [ ruby makeWrapper ]; + buildInputs = [ + ruby makeWrapper + # Needed for NSDefaultRunLoopMode symbols. + cf-private + ]; unpackPhase = "sourceRoot=."; @@ -134,7 +139,7 @@ in stdenv.mkDerivation { defaultStartX="$out/bin/startx -- $out/bin/Xquartz" ruby ${./patch_plist.rb} \ - ${lib.escapeShellArg (builtins.toXML { + ${stdenv.lib.escapeShellArg (builtins.toXML { XQUARTZ_DEFAULT_CLIENT = "${xterm}/bin/xterm"; XQUARTZ_DEFAULT_SHELL = "${shell}"; XQUARTZ_DEFAULT_STARTX = "@STARTX@"; @@ -179,7 +184,7 @@ in stdenv.mkDerivation { --replace "@FONTCONFIG_FILE@" "$fontsConfPath" ''; - meta = with lib; { + meta = with stdenv.lib; { platforms = platforms.darwin; maintainers = with maintainers; [ cstrahan ]; license = licenses.mit; |