summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDoron Behar <doron.behar@gmail.com>2020-11-28 18:02:19 +0200
committerGitHub <noreply@github.com>2020-11-28 18:02:19 +0200
commit2426a0ea7857b97e19269c0d13e7eaa2beba9aaa (patch)
treee7f2c77b0af0b00c8d51082165f21bf7a5f35726
parent439e5f5b673cc4e2f1dab85ff4d6c8a309cadbb7 (diff)
parent3533c4f5176d70346a20ea1fe8a523cb063d2b43 (diff)
Merge pull request #104491 from freezeboy/remove-macpath-droopy
-rw-r--r--pkgs/applications/networking/droopy/default.nix9
-rw-r--r--pkgs/top-level/all-packages.nix2
2 files changed, 9 insertions, 2 deletions
diff --git a/pkgs/applications/networking/droopy/default.nix b/pkgs/applications/networking/droopy/default.nix
index f3f5f54f4092..63afa5ce76f1 100644
--- a/pkgs/applications/networking/droopy/default.nix
+++ b/pkgs/applications/networking/droopy/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, fetchFromGitHub, wrapPython }:
+{ stdenv, lib, fetchFromGitHub, wrapPython, fetchpatch }:
with lib;
@@ -13,6 +13,13 @@ stdenv.mkDerivation {
sha256 = "03i1arwyj9qpfyyvccl21lbpz3rnnp1hsadvc0b23nh1z2ng9sff";
};
+ patches = [
+ (fetchpatch {
+ url = "https://patch-diff.githubusercontent.com/raw/stackp/Droopy/pull/30.patch";
+ sha256 = "Y6jBraKvVQAiScbvLwezSKeWY3vaAbhaNXEGNaItigQ=";
+ })
+ ];
+
nativeBuildInputs = [ wrapPython ];
installPhase = ''
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 4cc7f0e457fc..724b900eaca7 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -20752,7 +20752,7 @@ in
buildServerGui = false;
};
- droopy = python37Packages.callPackage ../applications/networking/droopy { };
+ droopy = python3Packages.callPackage ../applications/networking/droopy { };
drumgizmo = callPackage ../applications/audio/drumgizmo { };