Remove shell.nix.

This commit is contained in:
Jorge Acereda 2020-11-18 22:23:24 +01:00
parent 1f4302afeb
commit e3448ad250
2 changed files with 11 additions and 13 deletions

View File

@ -20,6 +20,8 @@ let
, ghc-prof-flamegraph
, clang , makeWrapper
, libXext, libXcursor, libXinerama, libXi, libXrandr, libXScrnSaver, libXxf86vm, libpthreadstubs, libXdmcp, libGL
, cabal-install, gdb , flamegraph, linuxPackages, tinycc, zig
}:
mkDerivation {
pname = "CarpHask";
@ -44,6 +46,10 @@ let
base containers directory haskeline optparse-applicative parsec process
clang
];
executableToolDepends = optionals pkgs.lib.inNixShell (
[ cabal-install clang gdb ]
++ optionals stdenv.isLinux [ flamegraph linuxPackages.perf tinycc zig ]
);
executableFrameworkDepends = with darwin.apple_sdk.frameworks; optionals stdenv.isDarwin [
Carbon Cocoa IOKit CoreFoundation CoreVideo IOKit ForceFeedback
];
@ -66,7 +72,9 @@ let
};
haskellPackages = if compiler == "default"
then pkgs.haskellPackages
else pkgs.haskell.packages.${compiler};
then pkgs.haskellPackages
else pkgs.haskell.packages.${compiler};
drv = haskellPackages.callPackage f {};
in haskellPackages.callPackage f {}
in
if pkgs.lib.inNixShell then drv.env else drv

View File

@ -1,10 +0,0 @@
{ nixpkgs ? import <nixpkgs> {}
, profiling ? false
, doBenchmark ? false
, doCheck ? false
}:
with nixpkgs;
(callPackage ./default.nix { inherit profiling doBenchmark doCheck; }).env.overrideAttrs (o: {
buildInputs = with pkgs; o.buildInputs ++ [ haskellPackages.cabal-install clang gdb ]
++ stdenv.lib.optionals stdenv.isLinux [ flamegraph linuxPackages.perf tinycc zig ];
})