Merge branch 'master' into staging-next

Hydra: ?compare=1472947

pkgs/misc/brightnessctl/default.nix

@@ -11,9 +11,10 @@ stdenv.mkDerivation rec {
     sha256 = "0amxhcikcgj04z81272kz35m5h5q4jx9x7v71h8yl1rv4b2lzh7z";
   };
 
-  makeFlags = "MODE=0755 PREFIX=/ DESTDIR=$(out)";
+  makeFlags = [ "MODE=0755" "PREFIX=" "DESTDIR=$(out)" ];
+  installTargets = [ "install" "install_udev_rules" ];
 
-  patchPhase = ''
+  postPatch = ''
     substituteInPlace 90-brightnessctl.rules --replace /bin/ ${coreutils}/bin/
     substituteInPlace 90-brightnessctl.rules --replace %k '*'
   '';

pkgs/misc/emulators/dosbox/unstable.nix

@@ -36,5 +36,6 @@ in stdenv.mkDerivation rec {
     description = "A DOS emulator";
     platforms = stdenv.lib.platforms.unix;
     maintainers = with stdenv.lib.maintainers; [ binarin ];
+    license = stdenv.lib.licenses.gpl2Plus;
   };
 }

pkgs/misc/phabricator/default.nix

@@ -28,5 +28,6 @@ stdenv.mkDerivation rec {
 
   meta = {
     platforms = stdenv.lib.platforms.unix;
+    license = stdenv.lib.licenses.asl20;
   };
 }