From c39770ecc5468a54aeaafb941ca0a055788fc6aa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sebasti=C3=A1n=20Mancilla?= Date: Sat, 9 Jul 2022 23:55:57 -0400 Subject: [PATCH 1/3] libui: fix typo when installing libs on darwin --- pkgs/development/libraries/libui/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/libui/default.nix b/pkgs/development/libraries/libui/default.nix index 14fb004187d8..a798977b1f41 100644 --- a/pkgs/development/libraries/libui/default.nix +++ b/pkgs/development/libraries/libui/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { ln -s $out/lib/libui.so.0 $out/lib/libui.so '' + lib.optionalString stdenv.isDarwin '' mv ./out/libui.A.dylib $out/lib/ - ln -s $out/lib/lubui.A.dylib $out/lib/libui.dylib + ln -s $out/lib/libui.A.dylib $out/lib/libui.dylib '' + '' cp $src/ui.h $out/include cp $src/ui_${backend}.h $out/include From cf88ead89d554904e2b29aef73df98d9bd336523 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sebasti=C3=A1n=20Mancilla?= Date: Sat, 9 Jul 2022 23:56:43 -0400 Subject: [PATCH 2/3] untrunc-anthwlock: mark as unbroken on darwin Fixed by c39770ecc54 (libui: fix typo when installing libs on darwin, 2022-07-09). --- pkgs/tools/video/untrunc-anthwlock/default.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/tools/video/untrunc-anthwlock/default.nix b/pkgs/tools/video/untrunc-anthwlock/default.nix index 83b56e2f056a..4b950fd0f220 100644 --- a/pkgs/tools/video/untrunc-anthwlock/default.nix +++ b/pkgs/tools/video/untrunc-anthwlock/default.nix @@ -27,7 +27,6 @@ stdenv.mkDerivation { enableParallelBuilding = true; meta = with lib; { - broken = stdenv.isDarwin; description = "Restore a truncated mp4/mov (improved version of ponchio/untrunc)"; homepage = "https://github.com/anthwlock/untrunc"; license = licenses.gpl2; From 3239a0535787625e036af8f59a45a5fe689ff4ca Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sebasti=C3=A1n=20Mancilla?= Date: Sat, 9 Jul 2022 23:57:14 -0400 Subject: [PATCH 3/3] untrunc-anthwlock: refactor build Use buildPhase to make clear that we need two invocations of 'make' with different targets. Also set IS_RELEASE to 1 to ensure an optimized build is created instead of a debug build (see Makefile). --- pkgs/tools/video/untrunc-anthwlock/default.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/video/untrunc-anthwlock/default.nix b/pkgs/tools/video/untrunc-anthwlock/default.nix index 4b950fd0f220..c127bfe8740e 100644 --- a/pkgs/tools/video/untrunc-anthwlock/default.nix +++ b/pkgs/tools/video/untrunc-anthwlock/default.nix @@ -11,11 +11,13 @@ stdenv.mkDerivation { sha256 = "14i2lq68q990hnm2kkfamlsi67bcml85zl8yjsyxc5h8ncc2f3dp"; }; - buildInputs = [ ffmpeg libui ]; - postBuild = '' - make untrunc-gui + buildPhase = '' + runHook preBuild + make IS_RELEASE=1 untrunc + make IS_RELEASE=1 untrunc-gui + runHook postBuild ''; installPhase = ''