From bc57f6d2e50207c89354366d733b59ba5c318b9e Mon Sep 17 00:00:00 2001 From: "S. Nordin Abouzahra" Date: Sun, 12 Jul 2020 02:23:44 -0400 Subject: [PATCH 1/2] sndio: 1.6.0 -> 1.7.0 Updates sndio to the latest version. --- pkgs/misc/sndio/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/misc/sndio/default.nix b/pkgs/misc/sndio/default.nix index c415714f573..6b493a20c90 100644 --- a/pkgs/misc/sndio/default.nix +++ b/pkgs/misc/sndio/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "sndio"; - version = "1.6.0"; + version = "1.7.0"; enableParallelBuilding = true; buildInputs = stdenv.lib.optionals stdenv.isLinux [ alsaLib ]; src = fetchurl { url = "http://www.sndio.org/sndio-${version}.tar.gz"; - sha256 = "1havdx3q4mipgddmd2bnygr1yh6y64567m1yqwjapkhsq550dq4r"; + sha256 = "0ljmac0lnjn61admgbcwjfcr5fwccrsblx9rj9bys8wlhz8f796x"; }; postFixup = stdenv.lib.optionalString stdenv.isDarwin '' From 96bd235e2f3070bf806afe0d9203fc3984407718 Mon Sep 17 00:00:00 2001 From: "S. Nordin Abouzahra" Date: Sat, 5 Sep 2020 19:21:05 -0400 Subject: [PATCH 2/2] sndio: fix up for Darwin Applying the suggestion by @risicle to use fixDarwinDylibNames instead of manually chasing the exact .dylib name in postFixup. --- pkgs/misc/sndio/default.nix | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/pkgs/misc/sndio/default.nix b/pkgs/misc/sndio/default.nix index 6b493a20c90..46c505ed439 100644 --- a/pkgs/misc/sndio/default.nix +++ b/pkgs/misc/sndio/default.nix @@ -1,23 +1,17 @@ -{ stdenv, fetchurl, alsaLib }: +{ stdenv, fetchurl, alsaLib, fixDarwinDylibNames }: stdenv.mkDerivation rec { pname = "sndio"; version = "1.7.0"; enableParallelBuilding = true; - buildInputs = stdenv.lib.optionals stdenv.isLinux [ alsaLib ]; + buildInputs = stdenv.lib.optionals stdenv.isLinux [ alsaLib ] + ++ stdenv.lib.optionals stdenv.isDarwin [ fixDarwinDylibNames ]; src = fetchurl { url = "http://www.sndio.org/sndio-${version}.tar.gz"; sha256 = "0ljmac0lnjn61admgbcwjfcr5fwccrsblx9rj9bys8wlhz8f796x"; }; - postFixup = stdenv.lib.optionalString stdenv.isDarwin '' - install_name_tool -id $out/lib/libsndio.7.0.dylib $out/lib/libsndio.7.0.dylib - for file in $out/bin/*; do - install_name_tool -change libsndio.7.0.dylib $out/lib/libsndio.dylib $file - done - ''; - meta = with stdenv.lib; { homepage = "http://www.sndio.org"; description = "Small audio and MIDI framework part of the OpenBSD project";