Skip to content

Commit

Permalink
Bump flake.lock
Browse files Browse the repository at this point in the history
  • Loading branch information
acowley committed Mar 11, 2022
1 parent 26034c0 commit fd2fae9
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 13 deletions.
20 changes: 10 additions & 10 deletions flake.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

7 changes: 4 additions & 3 deletions flake.nix
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
description = "Haskell wrapper for the ffmpeg library";

inputs = {
nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
nixpkgs.url = "github:nixos/nixpkgs/nixpkgs-unstable";
flake-utils.url = "github:numtide/flake-utils";
nix-filter.url = "github:numtide/nix-filter";
};
Expand All @@ -12,15 +12,16 @@
let pkgs = import nixpkgs {
inherit system;
};
compiler = "ghc8104";
compiler = "ghc8107";
hspkgs = pkgs.haskell.packages.${compiler};
ffmpeg-light = hspkgs.callPackage (import ./default.nix) { nix-filter = nix-filter.lib; };
ghc = hspkgs.ghc.withHoogle (ps: ffmpeg-light.passthru.getBuildInputs.haskellBuildInputs);
in {
devShell = pkgs.mkShell {
buildInputs = [
pkgs.SDL2 pkgs.ffmpeg pkgs.pkgconfig
ghc hspkgs.cabal-install hspkgs.haskell-language-server
ghc hspkgs.cabal-install
# hspkgs.haskell-language-server
];
};
packages.ffmpeg-light = ffmpeg-light;
Expand Down

0 comments on commit fd2fae9

Please sign in to comment.