public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

xquartz: add cf-private

Browse Source 
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
This commit is contained in:
Daiderd Jordan 2018-11-06 18:54:06 +01:00
parent f00a4af18f
commit 2b76ad8fe7
No known key found for this signature in database
GPG Key ID: D02435D05B810C96
2 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
pkgs/servers/x11/xquartz/default.nix
View File

@ -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 , quartz-wm, fontconfig, xlsfonts, xfontsel
, ttf_bitstream_vera, freefont_ttf, liberation_ttf , ttf_bitstream_vera, freefont_ttf, liberation_ttf
, cf-private
, shell ? "${bashInteractive}/bin/bash" , shell ? "${bashInteractive}/bin/bash"
}: }:
@ -97,7 +98,11 @@ let
in stdenv.mkDerivation { in stdenv.mkDerivation {
name = "xquartz-${stdenv.lib.getVersion xorg.xorgserver}"; name = "xquartz-${stdenv.lib.getVersion xorg.xorgserver}";
buildInputs = [ ruby makeWrapper ]; buildInputs = [
ruby makeWrapper
# Needed for NSDefaultRunLoopMode symbols.
cf-private
];
unpackPhase = "sourceRoot=."; unpackPhase = "sourceRoot=.";
@ -134,7 +139,7 @@ in stdenv.mkDerivation {
defaultStartX="$out/bin/startx -- $out/bin/Xquartz" defaultStartX="$out/bin/startx -- $out/bin/Xquartz"
ruby ${./patch_plist.rb} \ ruby ${./patch_plist.rb} \
${lib.escapeShellArg (builtins.toXML { ${stdenv.lib.escapeShellArg (builtins.toXML {
XQUARTZ_DEFAULT_CLIENT = "${xterm}/bin/xterm"; XQUARTZ_DEFAULT_CLIENT = "${xterm}/bin/xterm";
XQUARTZ_DEFAULT_SHELL = "${shell}"; XQUARTZ_DEFAULT_SHELL = "${shell}";
XQUARTZ_DEFAULT_STARTX = "@STARTX@"; XQUARTZ_DEFAULT_STARTX = "@STARTX@";
@ -179,7 +184,7 @@ in stdenv.mkDerivation {
--replace "@FONTCONFIG_FILE@" "$fontsConfPath" --replace "@FONTCONFIG_FILE@" "$fontsConfPath"
''; '';
meta = with lib; { meta = with stdenv.lib; {
platforms = platforms.darwin; platforms = platforms.darwin;
maintainers = with maintainers; [ cstrahan ]; maintainers = with maintainers; [ cstrahan ];
license = licenses.mit; license = licenses.mit;

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

@ -13842,7 +13842,10 @@ with pkgs;
xqilla = callPackage ../development/tools/xqilla { }; xqilla = callPackage ../development/tools/xqilla { };
xquartz = callPackage ../servers/x11/xquartz { }; xquartz = callPackage ../servers/x11/xquartz {
inherit (darwin) cf-private;
};
quartz-wm = callPackage ../servers/x11/quartz-wm { quartz-wm = callPackage ../servers/x11/quartz-wm {
stdenv = clangStdenv; stdenv = clangStdenv;
inherit (darwin) cf-private; inherit (darwin) cf-private;