alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

xquartz: remove cf-private

Browse source
This commit is contained in:
Daiderd Jordan 2019-06-19 21:44:58 +02:00
parent c558a74a1b
commit 40d34bb19f
No known key found for this signature in database
GPG key ID: D02435D05B810C96
3 changed files with 3 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
pkgs/servers/x11/quartz-wm/default.nix
View file

@ -1,4 +1,4 @@
{ stdenv, fetchurl, xorg, pixman, pkgconfig, AppKit, Foundation, Xplugin, cf-private }:
{ stdenv, fetchurl, xorg, pixman, pkgconfig, AppKit, Foundation, Xplugin }:
let version = "1.3.1";
in stdenv.mkDerivation {
@ -20,8 +20,6 @@ in stdenv.mkDerivation {
pixman
pkgconfig
AppKit Xplugin Foundation
# Needed for CFNotificationCenterAddObserver symbols.
cf-private
];
meta = with stdenv.lib; {
license = licenses.apsl20;

7
pkgs/servers/x11/xquartz/default.nix
View file

@ -1,7 +1,6 @@
{ 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"
}:
@ -98,11 +97,7 @@ let
in stdenv.mkDerivation {
name = "xquartz-${stdenv.lib.getVersion xorg.xorgserver}";
buildInputs = [
ruby makeWrapper
# Needed for NSDefaultRunLoopMode symbols.
cf-private
];
nativeBuildInputs = [ ruby makeWrapper ];
unpackPhase = "sourceRoot=.";

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

@ -14896,13 +14896,10 @@ in
xqilla = callPackage ../development/tools/xqilla { };
xquartz = callPackage ../servers/x11/xquartz {
inherit (darwin) cf-private;
};
xquartz = callPackage ../servers/x11/xquartz { };
quartz-wm = callPackage ../servers/x11/quartz-wm {
stdenv = clangStdenv;
inherit (darwin) cf-private;
inherit (darwin.apple_sdk.frameworks) AppKit Foundation;
inherit (darwin.apple_sdk.libs) Xplugin;
};