From 9db68de9e616bbc64182847eae79a398ccc3e885 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Sun, 6 Oct 2013 00:20:34 +0200 Subject: [PATCH] polkit, pulseaudio: Drop some Linux-specific dependencies --- pkgs/desktops/gnome-2/platform/libgnome/default.nix | 2 +- pkgs/development/libraries/polkit/default.nix | 2 +- pkgs/servers/pulseaudio/default.nix | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/desktops/gnome-2/platform/libgnome/default.nix b/pkgs/desktops/gnome-2/platform/libgnome/default.nix index 5ab6d5e813d..c190b9578e9 100644 --- a/pkgs/desktops/gnome-2/platform/libgnome/default.nix +++ b/pkgs/desktops/gnome-2/platform/libgnome/default.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation rec { name = src.pkgname; - + src = fetchurl_gnome { project = "libgnome"; major = "2"; minor = "32"; patchlevel = "1"; diff --git a/pkgs/development/libraries/polkit/default.nix b/pkgs/development/libraries/polkit/default.nix index 788b6d6d32b..9d1f0d18c1a 100644 --- a/pkgs/development/libraries/polkit/default.nix +++ b/pkgs/development/libraries/polkit/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, pkgconfig, glib, expat, pam, intltool, gettext , gobjectIntrospection -, useSystemd ? true, systemd }: +, useSystemd ? stdenv.isLinux, systemd }: let diff --git a/pkgs/servers/pulseaudio/default.nix b/pkgs/servers/pulseaudio/default.nix index 629dcb5bbce..4b23cb4173c 100644 --- a/pkgs/servers/pulseaudio/default.nix +++ b/pkgs/servers/pulseaudio/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { # Since `libpulse*.la' contain `-lgdbm' and `-lcap', it must be propagated. propagatedBuildInputs - = [ gdbm ] ++ stdenv.lib.optionals (!stdenv.isDarwin) [ libcap ]; + = [ gdbm ] ++ stdenv.lib.optionals stdenv.isLinux [ libcap ]; buildInputs = [ pkgconfig gnum4 libtool intltool glib dbus avahi libsamplerate libsndfile @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { ++ stdenv.lib.optional jackaudioSupport jackaudio ++ stdenv.lib.optionals x11Support [ xlibs.xlibs xlibs.libXtst xlibs.libXi ] ++ stdenv.lib.optional useSystemd systemd - ++ stdenv.lib.optionals (!stdenv.isDarwin) [ alsaLib bluez sbc udev ]; + ++ stdenv.lib.optionals stdenv.isLinux [ alsaLib bluez sbc udev ]; preConfigure = '' # Move the udev rules under $(prefix).