Merge pull request #113345 from SuperSandro2000/fix-collection14

2021-02-17 14:38:32 +01:00
parent 04e04ead20 05f43031d2
commit 6d5d0d5a31
34 changed files with 103 additions and 61 deletions
--- a/pkgs/tools/misc/pubs/default.nix
+++ b/pkgs/tools/misc/pubs/default.nix
@@ -1,4 +1,4 @@
-{ lib, fetchFromGitHub, fetchpatch, python3Packages }:
+{ lib, fetchFromGitHub, python3Packages }:

 python3Packages.buildPythonApplication rec {
  pname = "pubs";
--- a/pkgs/tools/misc/yubikey-manager-qt/default.nix
+++ b/pkgs/tools/misc/yubikey-manager-qt/default.nix
@@ -11,8 +11,6 @@
 , qtgraphicaleffects
 , qtquickcontrols
 , qtquickcontrols2
-, qtdeclarative
-, qtsvg
 , yubikey-manager
 , yubikey-personalization
 }:
--- a/pkgs/tools/security/gen-oath-safe/default.nix
+++ b/pkgs/tools/security/gen-oath-safe/default.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {

  buildInputs = [ makeWrapper ];

-  buildPhase = ":";
+  dontBuild = true;

  installPhase =
    let