From 2ecc06e5575c01ec929e580d570cb71a1baaf778 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 8 May 2019 18:12:24 +0200 Subject: [PATCH] Replace shell.nix with a flake devShell attribute --- flake.nix | 7 +++++++ release.nix | 4 +--- shell.nix | 1 - 3 files changed, 8 insertions(+), 4 deletions(-) delete mode 100644 shell.nix diff --git a/flake.nix b/flake.nix index 1e9bc312..15e30151 100644 --- a/flake.nix +++ b/flake.nix @@ -17,5 +17,12 @@ packages.hydra = hydraJobs.build.x86_64-linux; defaultPackage = packages.hydra; + + devShell = (import ./release.nix { + hydraSrc = deps.self; + nixpkgs = deps.nixpkgs; + shell = true; + }).build.x86_64-linux; + }; } diff --git a/release.nix b/release.nix index 9d060d6d..4747b9ba 100644 --- a/release.nix +++ b/release.nix @@ -138,9 +138,7 @@ rec { preConfigure = "autoreconf -vfi"; - NIX_LDFLAGS = [ - "-lpthread" - ]; + NIX_LDFLAGS = [ "-lpthread" ]; enableParallelBuilding = true; diff --git a/shell.nix b/shell.nix deleted file mode 100644 index 454c00bf..00000000 --- a/shell.nix +++ /dev/null @@ -1 +0,0 @@ -(import ./release.nix { shell = true; }).build.x86_64-linux