From de8aec4d942305747eff044c3415180bf2a22812 Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Mon, 13 Nov 2017 00:33:07 -0600 Subject: [PATCH 1/2] quartz-wm: fix and avoid impurities --- pkgs/servers/x11/quartz-wm/default.nix | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/pkgs/servers/x11/quartz-wm/default.nix b/pkgs/servers/x11/quartz-wm/default.nix index 45e4df2bb8b..ce129773b57 100644 --- a/pkgs/servers/x11/quartz-wm/default.nix +++ b/pkgs/servers/x11/quartz-wm/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, xorg, pixman, pkgconfig, AppKit, Xplugin }: +{ stdenv, lib, fetchurl, xorg, pixman, pkgconfig, AppKit, Xplugin, darwin }: let version = "1.3.1"; in stdenv.mkDerivation { @@ -19,11 +19,8 @@ in stdenv.mkDerivation { xorg.libXext pixman pkgconfig - AppKit Xplugin + AppKit Xplugin darwin.apple_sdk.frameworks.Foundation ]; - NIX_CFLAGS_COMPILE = "-F/System/Library/Frameworks -I/usr/include"; - NIX_LDFLAGS = stdenv.lib.optional stdenv.isDarwin - "/System/Library/Frameworks/CoreFoundation.framework/Versions/A/CoreFoundation"; meta = with lib; { license = licenses.apsl20; platforms = platforms.darwin; From a2bce20390fa6ce91f0b6ccdc7a5f7aec7373768 Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Mon, 13 Nov 2017 00:33:45 -0600 Subject: [PATCH 2/2] quartz-wm: add myself as maintainer --- pkgs/servers/x11/quartz-wm/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/servers/x11/quartz-wm/default.nix b/pkgs/servers/x11/quartz-wm/default.nix index ce129773b57..d724a81debb 100644 --- a/pkgs/servers/x11/quartz-wm/default.nix +++ b/pkgs/servers/x11/quartz-wm/default.nix @@ -24,5 +24,6 @@ in stdenv.mkDerivation { meta = with lib; { license = licenses.apsl20; platforms = platforms.darwin; + maintainers = with maintainers; [ matthewbauer ]; }; }