pyrox.dev / nixpkgs
lol
fork atom

natron: cleanup

Weijia Wang 15bce5c2 0eede3e3

+10 -9
unified split
+9 -8
pkgs/applications/video/natron/default.nix
··· 1 1 { lib 2 2 , stdenv 3 3 , fetchFromGitHub 4 - , qt5 5 4 , cmake 6 5 , pkg-config 6 + , wrapQtAppsHook 7 7 , boost 8 8 , cairo 9 9 , ceres-solver ··· 12 12 , glog 13 13 , libXdmcp 14 14 , python3 15 - , python3Packages 16 15 , wayland 17 16 }: 18 17 ··· 23 22 owner = "NatronGitHub"; 24 23 repo = "OpenColorIO-Configs"; 25 24 rev = "Natron-v${minorVersion}"; 26 - sha256 = "sha256-TD7Uge9kKbFxOmOCn+TSQovnKTmFS3uERTu5lmZFHbc="; 25 + hash = "sha256-TD7Uge9kKbFxOmOCn+TSQovnKTmFS3uERTu5lmZFHbc="; 27 26 }; 28 27 in 29 - qt5.mkDerivation { 28 + stdenv.mkDerivation { 30 29 inherit version; 31 30 pname = "natron"; 32 31 ··· 35 34 repo = "Natron"; 36 35 rev = "v${version}"; 37 36 fetchSubmodules = true; 38 - sha256 = "sha256-dgScbfyulZPlrngqSw7xwipldoRd8uFO8VP9mlJyhQ8="; 37 + hash = "sha256-dgScbfyulZPlrngqSw7xwipldoRd8uFO8VP9mlJyhQ8="; 39 38 }; 40 39 41 40 cmakeFlags = [ "-DNATRON_SYSTEM_LIBS=ON" ]; ··· 43 42 nativeBuildInputs = [ 44 43 cmake 45 44 pkg-config 45 + wrapQtAppsHook 46 46 ]; 47 47 48 48 buildInputs = [ ··· 50 50 expat 51 51 cairo 52 52 python3 53 - python3Packages.pyside2 54 - python3Packages.shiboken2 53 + python3.pkgs.pyside2 54 + python3.pkgs.shiboken2 55 55 extra-cmake-modules 56 56 wayland 57 57 glog ··· 66 66 67 67 postFixup = '' 68 68 wrapProgram $out/bin/Natron \ 69 - --prefix PYTHONPATH : "${python3Packages.makePythonPath [ python3Packages.qtpy python3Packages.pyside2 ]}" \ 69 + --prefix PYTHONPATH : "${python3.pkgs.makePythonPath [ python3.pkgs.qtpy python3.pkgs.pyside2 ]}" \ 70 70 --set-default OCIO "$out/share/OpenColorIO-Configs/blender/config.ocio" 71 71 ''; 72 72 ··· 80 80 license = lib.licenses.gpl2; 81 81 maintainers = [ maintainers.puffnfresh ]; 82 82 platforms = platforms.linux; 83 + broken = stdenv.isLinux && stdenv.isAarch64; 83 84 }; 84 85 }
+1 -1
pkgs/top-level/all-packages.nix
··· 31994 31994 31995 31995 neomutt = callPackage ../applications/networking/mailreaders/neomutt { }; 31996 31996 31997 - natron = qt5.callPackage ../applications/video/natron { }; 31997 + natron = libsForQt5.callPackage ../applications/video/natron { }; 31998 31998 31999 31999 natural-docs = callPackage ../applications/misc/natural-docs { }; 32000 32000