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

Merge staging-next into staging

Browse Source
This commit is contained in:
github-actions[bot]
2021-04-28 00:15:29 +00:00
committed by GitHub
parent 97889a52e1 dc8ff4a460
commit 655989d7b3
33 changed files with 318 additions and 190 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/applications/graphics/kodelife/default.nix
+8 -8
View File
@@ -9,22 +9,20 @@
stdenv.mkDerivation rec {
pname = "kodelife";
version = "0.9.0.129";
version = "0.9.8.143";
suffix = {
aarch64-linux = "linux-arm64";
armv7l-linux = "linux-armhf";
x86_64-darwin = "macos";
x86_64-linux = "linux-x86_64";
}.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}");
src = fetchzip {
url = "https://hexler.net/pub/${pname}/${pname}-${version}-${suffix}.zip";
sha256 = {
aarch64-linux = "0z2fqlf156348ha3zhv16kvqdx68fbwbzch2gzjm9x1na9n5k1ra";
armv7l-linux = "1ppwgrmgl1j2ws9mhrscvvkamd69a6xw7x35df6d30cyj97r0mzy";
x86_64-darwin = "0f8vn6m3xzsiyxm2ka5wkbp63wvzrix6g1xrbpvcm3v2llmychkl";
x86_64-linux = "035c1nlw0nim057sz3axpkcgkafqbm6gpr8hwr097vlrqll6w3dv";
aarch64-linux = "0ryjmpzpfqdqrvqpq851vvrjd8ld5g91gcigpv9rxp3z1b7qdand";
armv7l-linux = "08nlwn8ixndqil4m7j6c8gjxmwx8zi3in86arnwf13shk6cds5nb";
x86_64-linux = "0kbz7pvh4i4a3pj1vzbzzslha825i888isvsigcqsqvipjr4798q";
}.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}");
};
@@ -35,8 +33,10 @@ stdenv.mkDerivation rec {
preferLocalBuild = true;
installPhase = ''
runHook preInstall
mkdir -p $out/bin
mv KodeLife $out/bin
runHook postInstall
'';
preFixup = let
@@ -49,7 +49,7 @@ stdenv.mkDerivation rec {
libGLU libGL
xorg.libX11
];
in lib.optionalString (!stdenv.isDarwin) ''
in ''
patchelf \
--set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
--set-rpath "${libPath}" \
@@ -61,6 +61,6 @@ stdenv.mkDerivation rec {
description = "Real-time GPU shader editor";
license = licenses.unfree;
maintainers = with maintainers; [ prusnak ];
platforms = [ "aarch64-linux" "armv7l-linux" "x86_64-darwin" "x86_64-linux" ];
platforms = [ "aarch64-linux" "armv7l-linux" "x86_64-linux" ];
};
}
pkgs/applications/graphics/krita/default.nix
+4 -4
View File
@@ -10,11 +10,11 @@
mkDerivation rec {
pname = "krita";
version = "4.4.2";
version = "4.4.3";
src = fetchurl {
url = "https://download.kde.org/stable/${pname}/${version}/${pname}-${version}.tar.xz";
sha256 = "121fjdv5phx1aqk21vx9k9vsc5k1w8s86gp6pamy2y31r2ph7r8y";
url = "https://download.kde.org/stable/${pname}/${version}/${pname}-${version}.tar.gz";
sha256 = "0rwghzci2wn2jmisvnzs23yxc2z3d4dcx2qbbhcvjyi3q8ij61nl";
};
nativeBuildInputs = [ cmake extra-cmake-modules python3Packages.sip makeWrapper ];
@@ -48,6 +48,6 @@ mkDerivation rec {
homepage = "https://krita.org/";
maintainers = with maintainers; [ abbradar ];
platforms = platforms.linux;
license = licenses.gpl2;
license = licenses.gpl3Only;
};
}