From 0564a32785bfdfe5d98979eaa29747681912c0e7 Mon Sep 17 00:00:00 2001 From: zimbatm Date: Tue, 28 Apr 2020 12:49:45 +0200 Subject: [PATCH 1/2] Test.hs: inherit stderr from the parent This allows to show the progress while building the tests --- Test.hs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Test.hs b/Test.hs index ad63341..7503916 100755 --- a/Test.hs +++ b/Test.hs @@ -17,7 +17,7 @@ import Data.List (find) currentChannel = "channel:nixos-19.09-small" -- | Utils function: run a command and returns its output. -processOutput p args = Text.strip . Text.pack <$> readCreateProcess ((proc (Text.unpack p) (Text.unpack <$> args)) { std_err = CreatePipe }) "" +processOutput p args = Text.strip . Text.pack <$> readCreateProcess ((proc (Text.unpack p) (Text.unpack <$> args)) { std_err = Inherit }) "" -- * OpenGL From 9348b49674b68c69408da1d573b608a9fc401a5a Mon Sep 17 00:00:00 2001 From: zimbatm Date: Tue, 28 Apr 2020 12:03:49 +0200 Subject: [PATCH 2/2] Test.hs: fixes the default.nix invocation This has been broken by me in d0379a8673605ac300a539479e8cfc0ea0a010df --- Test.hs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Test.hs b/Test.hs index 7503916..64581c5 100755 --- a/Test.hs +++ b/Test.hs @@ -22,7 +22,7 @@ processOutput p args = Text.strip . Text.pack <$> readCreateProcess ((proc (Text -- * OpenGL -- | Returns the path to the nixGLXXX binary. -getNixGLBin version = (<>("/bin/"<>version)) <$> processOutput "nix-build" ["./", "-A", version, "--arg", "pkgs", "import (fetchTarball " <> currentChannel <> ")"] +getNixGLBin version = (<>("/bin/"<>version)) <$> processOutput "nix-build" ["./", "-A", version, "-I", "nixpkgs=" <> currentChannel] -- | Returns the vendor string associated with a glxinfo wrapped by a nixGL. getVendorString io = do