www

commit 3df3a471aee506cb50212488f6b9391444764110
parent e2cc0101af3a45d3d1bfe71e3edb821be3868ac4
Author: Guillaume Bouchard <guillaum.bouchard@gmail.com>
Date:   Tue, 28 Apr 2020 13:54:10 +0200

Merge pull request #39 from zimbatm/test-fixes

Test.hs: fixes the default.nix invocation
Diffstat:
M
Test.hs
 | 
4
++--

1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/Test.hs b/Test.hs
@@ -17,12 +17,12 @@ 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
 
 -- | 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