Merge remote-tracking branch 'channels/nixpkgs-unstable' into staging

2017-10-18 14:53:30 -04:00
parent cae2a8ce9f 00e56fbbee
commit ee9c59c5b3
55 changed files with 2549 additions and 1108 deletions
--- a/pkgs/development/libraries/db/db-5.3.nix
+++ b/pkgs/development/libraries/db/db-5.3.nix
@@ -3,6 +3,5 @@
 import ./generic.nix (args // rec {
  version = "5.3.28";
  sha256 = "0a1n5hbl7027fbz5lm0vp0zzfp1hmxnz14wx3zl9563h83br5ag0";
-  license = stdenv.lib.licenses.agpl3;
  extraPatches = [ ./clang-5.3.patch ];
 })
--- a/pkgs/development/libraries/opensubdiv/default.nix
+++ b/pkgs/development/libraries/opensubdiv/default.nix
@@ -28,8 +28,8 @@
    [ "-DNO_TUTORIALS=1"
      "-DNO_REGRESSION=1"
      "-DNO_EXAMPLES=1"
-      "-DGLEW_INCLUDE_DIR=${glew}/include"
-      "-DGLEW_LIBRARY=${glew}/lib"
+      "-DGLEW_INCLUDE_DIR=${glew.dev}/include"
+      "-DGLEW_LIBRARY=${glew.dev}/lib"
    ];

  enableParallelBuilding = true;