public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge release-21.05 into staging-next-21.05

Browse Source
This commit is contained in:
github-actions[bot] 2021-08-17 06:02:28 +00:00 committed by GitHub
commit c3f08e6146
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
pkgs/applications/graphics/drawpile/default.nix
View File

@ -69,23 +69,15 @@ let
in mkDerivation rec {
pname = "drawpile";
version = "2.1.17";
version = "2.1.19";
src = fetchFromGitHub {
owner = "drawpile";
repo = "drawpile";
rev = version;
sha256 = "sha256-AFFY+FcY9ExAur13OoWR9285RZtBe6jnRIrwi5raiCM=";
sha256 = "sha256-MNmzcqTHfMms6q3ZilrChE5WoGzGxnAOkB0a75udA1I=";
};
patches = [
# fix for libmicrohttpd 0.9.71
(fetchpatch {
url = "https://github.com/drawpile/Drawpile/commit/ed1a75deb113da2d1df91a28f557509c4897130e.diff";
sha256 = "sha256-54wabH5F3Hf+6vv9rpCwCRdhjSaUFtuF/mE1/U+CpOA=";
name = "mhdfix.patch"; })
];
nativeBuildInputs = [ extra-cmake-modules ];
buildInputs = [

4
pkgs/top-level/all-packages.nix
View File

@ -23108,8 +23108,8 @@ in
drawio = callPackage ../applications/graphics/drawio {};
drawpile = libsForQt514.callPackage ../applications/graphics/drawpile { };
drawpile-server-headless = libsForQt514.callPackage ../applications/graphics/drawpile {
drawpile = libsForQt5.callPackage ../applications/graphics/drawpile { };
drawpile-server-headless = libsForQt5.callPackage ../applications/graphics/drawpile {
buildClient = false;
buildServerGui = false;
};