Replace shell.nix with a flake devShell attribute

2019-05-08 18:12:24 +02:00 · 2019-05-08 18:12:24 +02:00 · 2ecc06e557
parent 4172b5b290
commit 2ecc06e557
3 changed files with 8 additions and 4 deletions
--- 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;
+
  };
 }
--- a/release.nix
+++ b/release.nix
@ -138,9 +138,7 @@ rec {

      preConfigure = "autoreconf -vfi";

-      NIX_LDFLAGS = [
-          "-lpthread"
-	];
+      NIX_LDFLAGS = [ "-lpthread" ];

      enableParallelBuilding = true;

--- a/shell.nix
+++ b/shell.nix
@ -1 +0,0 @@
-(import ./release.nix { shell = true; }).build.x86_64-linux
				`@ -1 +0,0 @@`
				`(import ./release.nix { shell = true; }).build.x86_64-linux`