solarus-launcher/quest-editor: un-vendor qlementine in nixpkgs (#431017)

authored by

Peder Bergebakken Sundt and committed by
GitHub
d9f8d701 6a71e651

+62 -58
+44
pkgs/by-name/qt/qtappinstancemanager/package.nix
···
··· 1 + { 2 + lib, 3 + stdenv, 4 + fetchFromGitHub, 5 + cmake, 6 + qt6, 7 + nix-update-script, 8 + }: 9 + 10 + stdenv.mkDerivation (finalAttrs: { 11 + pname = "qtappinstancemanager"; 12 + version = "1.3.0"; 13 + 14 + src = fetchFromGitHub { 15 + owner = "oclero"; 16 + repo = "qtappinstancemanager"; 17 + tag = "v${finalAttrs.version}"; 18 + hash = "sha256-/zvNR/RHNV19ZI8d+58sotWxY16q2a7wWIBuKO52H5M="; 19 + }; 20 + 21 + nativeBuildInputs = [ 22 + cmake 23 + ]; 24 + 25 + buildInputs = [ 26 + qt6.qtbase 27 + ]; 28 + 29 + dontWrapQtApps = true; 30 + 31 + passthru = { 32 + updateScript = nix-update-script { }; 33 + }; 34 + 35 + meta = { 36 + description = "Single application instance manager for Qt6"; 37 + homepage = "https://github.com/oclero/qtappinstancemanager"; 38 + changelog = "https://github.com/oclero/qtappinstancemanager/blob/${finalAttrs.src.tag}/CHANGELOG.md"; 39 + license = lib.licenses.mit; 40 + maintainers = with lib.maintainers; [ normalcea ]; 41 + mainProgram = "qtappinstancemanager"; 42 + platforms = lib.platforms.all; 43 + }; 44 + })
+11 -36
pkgs/by-name/so/solarus-launcher/package.nix
··· 2 lib, 3 stdenv, 4 fetchFromGitLab, 5 - fetchFromGitHub, 6 replaceVars, 7 cmake, 8 ninja, ··· 16 libvorbis, 17 solarus, 18 glm, 19 - qt6Packages, 20 - kdePackages, 21 }: 22 23 - let 24 - qlementine-icons-src = fetchFromGitHub { 25 - owner = "oclero"; 26 - repo = "qlementine-icons"; 27 - tag = "v1.8.0"; 28 - hash = "sha256-FPndzMEOQvYNYUbT2V6iDlwoYqOww38GW/T3zUID3g0="; 29 - }; 30 - 31 - qlementine-src = fetchFromGitHub { 32 - owner = "oclero"; 33 - repo = "qlementine"; 34 - tag = "v1.2.1"; 35 - hash = "sha256-CPQMmTXyUW+CyLjHYx+IdXY4I2mVPudOmAksjd+izPA="; 36 - }; 37 - 38 - qtappinstancemanager-src = fetchFromGitHub { 39 - owner = "oclero"; 40 - repo = "qtappinstancemanager"; 41 - tag = "v1.3.0"; 42 - hash = "sha256-/zvNR/RHNV19ZI8d+58sotWxY16q2a7wWIBuKO52H5M="; 43 - }; 44 - 45 - inherit (qt6Packages) 46 - qtbase 47 - qttools 48 - wrapQtAppsHook 49 - ; 50 - in 51 stdenv.mkDerivation (finalAttrs: { 52 pname = "solarus-launcher"; 53 version = "2.0.0"; ··· 61 62 patches = [ 63 (replaceVars ./github-fetches.patch { 64 - inherit qlementine-src qlementine-icons-src qtappinstancemanager-src; 65 }) 66 ]; 67 ··· 69 nativeBuildInputs = [ 70 cmake 71 ninja 72 - qttools 73 - wrapQtAppsHook 74 ]; 75 76 buildInputs = [ ··· 83 libmodplug 84 libvorbis 85 solarus 86 - qtbase 87 - kdePackages.qtsvg 88 glm 89 ]; 90
··· 2 lib, 3 stdenv, 4 fetchFromGitLab, 5 replaceVars, 6 cmake, 7 ninja, ··· 15 libvorbis, 16 solarus, 17 glm, 18 + qt6, 19 + qlementine, 20 + qlementine-icons, 21 + qtappinstancemanager, 22 }: 23 24 stdenv.mkDerivation (finalAttrs: { 25 pname = "solarus-launcher"; 26 version = "2.0.0"; ··· 34 35 patches = [ 36 (replaceVars ./github-fetches.patch { 37 + qlementine-src = qlementine.src; 38 + qlementine-icons-src = qlementine-icons.src; 39 + qtappinstancemanager-src = qtappinstancemanager.src; 40 }) 41 ]; 42 ··· 44 nativeBuildInputs = [ 45 cmake 46 ninja 47 + qt6.qttools 48 + qt6.wrapQtAppsHook 49 ]; 50 51 buildInputs = [ ··· 58 libmodplug 59 libvorbis 60 solarus 61 + qt6.qtbase 62 + qt6.qtsvg 63 glm 64 ]; 65
+7 -22
pkgs/by-name/so/solarus-quest-editor/package.nix
··· 2 lib, 3 stdenv, 4 fetchFromGitLab, 5 - fetchFromGitHub, 6 replaceVars, 7 cmake, 8 ninja, 9 luajit, ··· 16 libvorbis, 17 solarus, 18 glm, 19 - qt6Packages, 20 - kdePackages, 21 }: 22 23 - let 24 - qlementine-src = fetchFromGitHub { 25 - owner = "oclero"; 26 - repo = "qlementine"; 27 - tag = "v1.2.0"; 28 - hash = "sha256-25PKOpQl3IkBXX14gt8KKYXXJKeutQ75O7BftEqCAxk="; 29 - }; 30 - 31 - inherit (qt6Packages) 32 - qtbase 33 - qttools 34 - wrapQtAppsHook 35 - ; 36 - in 37 stdenv.mkDerivation (finalAttrs: { 38 pname = "solarus-quest-editor"; 39 version = "2.0.0"; ··· 46 }; 47 48 patches = [ 49 - (replaceVars ./qlementine-src.patch { inherit qlementine-src; }) 50 ]; 51 52 strictDeps = true; 53 nativeBuildInputs = [ 54 cmake 55 ninja 56 - qttools 57 - wrapQtAppsHook 58 ]; 59 60 buildInputs = [ ··· 67 libmodplug 68 libvorbis 69 solarus 70 - qtbase 71 - kdePackages.qtsvg 72 glm 73 ]; 74
··· 2 lib, 3 stdenv, 4 fetchFromGitLab, 5 replaceVars, 6 + qlementine, 7 cmake, 8 ninja, 9 luajit, ··· 16 libvorbis, 17 solarus, 18 glm, 19 + qt6, 20 }: 21 22 stdenv.mkDerivation (finalAttrs: { 23 pname = "solarus-quest-editor"; 24 version = "2.0.0"; ··· 31 }; 32 33 patches = [ 34 + (replaceVars ./qlementine-src.patch { qlementine-src = qlementine.src; }) 35 ]; 36 37 strictDeps = true; 38 nativeBuildInputs = [ 39 cmake 40 ninja 41 + qt6.qttools 42 + qt6.wrapQtAppsHook 43 ]; 44 45 buildInputs = [ ··· 52 libmodplug 53 libvorbis 54 solarus 55 + qt6.qtbase 56 + qt6.qtsvg 57 glm 58 ]; 59