From 336bc8283bd4ef288e60c5fdb1b67196b9ea5c85 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Mon, 26 Oct 2020 08:17:14 +0100 Subject: Re-Revert "Merge #101508: libraw: 0.20.0 -> 0.20.2" This reverts commit c778945806b44d46ec16bc4302e7e7163e6bab97. I believe this is exactly what brings the staging branch into the right shape after the last merge from master (through staging-next); otherwise part of staging changes would be lost (due to being already reachable from master but reverted). --- pkgs/misc/sndio/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs/misc/sndio') diff --git a/pkgs/misc/sndio/default.nix b/pkgs/misc/sndio/default.nix index 46c505ed439c..34e60b8a4bb7 100644 --- a/pkgs/misc/sndio/default.nix +++ b/pkgs/misc/sndio/default.nix @@ -4,8 +4,8 @@ stdenv.mkDerivation rec { pname = "sndio"; version = "1.7.0"; enableParallelBuilding = true; - buildInputs = stdenv.lib.optionals stdenv.isLinux [ alsaLib ] - ++ stdenv.lib.optionals stdenv.isDarwin [ fixDarwinDylibNames ]; + nativeBuildInputs = stdenv.lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames; + buildInputs = stdenv.lib.optional stdenv.hostPlatform.isLinux alsaLib; src = fetchurl { url = "http://www.sndio.org/sndio-${version}.tar.gz"; -- cgit v1.2.3