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

Merge master into staging-next

Browse Source
This commit is contained in:
github-actions[bot]
2021-05-16 18:32:41 +00:00
committed by GitHub
parent 684991c696 805825cc52
commit 8c6d819143
40 changed files with 156 additions and 139 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/applications/graphics/jpeg-archive/default.nix
+2 -1
View File
@@ -22,9 +22,10 @@ stdenv.mkDerivation {
'';
makeFlags = [
"CC=${stdenv.cc.targetPrefix}cc"
"PREFIX=$(out)"
"MOZJPEG_PREFIX=${mozjpeg}"
"LIBJPEG=${mozjpeg}/lib/libjpeg.so"
"LIBJPEG=${mozjpeg}/lib/libjpeg${stdenv.hostPlatform.extensions.sharedLibrary}"
];
postInstall = ''
pkgs/applications/graphics/krita/default.nix
+1 -1
View File
@@ -17,7 +17,7 @@ mkDerivation rec {
sha256 = "0rwghzci2wn2jmisvnzs23yxc2z3d4dcx2qbbhcvjyi3q8ij61nl";
};
nativeBuildInputs = [ cmake extra-cmake-modules python3Packages.sip makeWrapper ];
nativeBuildInputs = [ cmake extra-cmake-modules python3Packages.sip_4 makeWrapper ];
buildInputs = [
karchive kconfig kwidgetsaddons kcompletion kcoreaddons kguiaddons