From 8abf3eaa38c1b6e5159a7a114f819499404f2622 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Fri, 20 May 2022 20:56:56 +0200 Subject: [PATCH] Revert "libfreeaptx: avoid rebuilding on Linux for now" This reverts commit 39f9c2dcfebcf1dc7607e8dcf8ce620ab76c6899. Here on staging we can clean up and use nicer nix code. --- pkgs/development/libraries/libfreeaptx/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/libfreeaptx/default.nix b/pkgs/development/libraries/libfreeaptx/default.nix index 618b74258a4..648b6fac0df 100644 --- a/pkgs/development/libraries/libfreeaptx/default.nix +++ b/pkgs/development/libraries/libfreeaptx/default.nix @@ -11,11 +11,11 @@ stdenv.mkDerivation rec { sha256 = "sha256-eEUhOrKqb2hHWanY+knpY9FBEnjkkFTB+x6BZgMBpbo="; }; - postPatch = if stdenv.isDarwin then '' + postPatch = lib.optionalString stdenv.isDarwin '' substituteInPlace Makefile \ --replace '-soname' '-install_name' \ --replace 'lib$(NAME).so' 'lib$(NAME).dylib' - '' else null; + ''; makeFlags = [ "PREFIX=${placeholder "out"}" @@ -27,12 +27,12 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - postInstall = if stdenv.isDarwin then '' + postInstall = lib.optionalString stdenv.isDarwin '' install_name_tool -change libfreeaptx.dylib.0 $out/lib/libfreeaptx.dylib.0 $out/bin/freeaptxdec install_name_tool -change libfreeaptx.dylib.0 $out/lib/libfreeaptx.dylib.0 $out/bin/freeaptxenc install_name_tool -id $out/lib/libfreeaptx.dylib $out/lib/libfreeaptx.dylib install_name_tool -id $out/lib/libfreeaptx.dylib.0 $out/lib/libfreeaptx.dylib.0 - '' else null; + ''; meta = with lib; { description = "Free Implementation of Audio Processing Technology codec (aptX)";