nix-plugins: Bump for new nix plugin mechanism

NixOS · Feb 13, 2018 · 9ef5d9c · dtzWill · Feb 13, 2018 · shlevy
1 parent 358b821
commit 9ef5d9c
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 7 deletions.
diff --git a/pkgs/development/libraries/nix-plugins/default.nix b/pkgs/development/libraries/nix-plugins/default.nix
@@ -1,18 +1,16 @@
-{ stdenv, fetchFromGitHub, nix, boehmgc }:
-let version = "2.0.7"; in
+{ stdenv, fetchFromGitHub, nix, boehmgc, cmake, pkgconfig }:
+let version = "3.0.1"; in
 stdenv.mkDerivation {
   name = "nix-plugins-${version}";
 
   src = fetchFromGitHub {
     owner = "shlevy";
     repo = "nix-plugins";
     rev = version;
-    sha256 = "1q4ydp2w114wbfm41m4qgrabha7ifa17xyz5dr137vvnj6njp4vs";
+    sha256 = "1pmk2m0kc6a3jqygm5cy1fl5gbcy0ghc2xs4ww0gh20walrys82r";
   };
 
-  buildFlags = [ "NIX_INCLUDE=${nix.dev}/include" "GC_INCLUDE=${boehmgc.dev}/include" ];
-
-  installFlags = [ "PREFIX=$(out)" ];
+  buildInputs = [ cmake pkgconfig nix ];
 
   meta = {
     description = "Collection of miscellaneous plugins for the nix expression language";

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
@@ -10400,7 +10400,8 @@ with pkgs;
   };
   libnghttp2 = nghttp2.lib;
 
-  nix-plugins = callPackage ../development/libraries/nix-plugins {};
+  nix-plugins = callPackage ../development/libraries/nix-plugins
+    { nix = nixUnstable; };
 
   nlohmann_json = callPackage ../development/libraries/nlohmann_json { };