zeal: 0.6.1.20230320 -> 0.6.1.20230907
- Remove null defaults - Use rec-less, overlay-style overridable recursive attributes (in effect since https://github.com/NixOS/nixpkgs/pull/119942); - Reorder lists - Add myself to maintainers
This commit is contained in:
parent
ac1367d48c
commit
5a31db94ce
2 changed files with 26 additions and 18 deletions
|
@ -7,7 +7,7 @@
|
||||||
, qtbase
|
, qtbase
|
||||||
, qtimageformats
|
, qtimageformats
|
||||||
, qtwebengine
|
, qtwebengine
|
||||||
, qtx11extras ? null # qt5 only
|
, qtx11extras
|
||||||
, libarchive
|
, libarchive
|
||||||
, libXdmcp
|
, libXdmcp
|
||||||
, libpthreadstubs
|
, libpthreadstubs
|
||||||
|
@ -17,17 +17,16 @@
|
||||||
|
|
||||||
let
|
let
|
||||||
isQt5 = lib.versions.major qtbase.version == "5";
|
isQt5 = lib.versions.major qtbase.version == "5";
|
||||||
|
|
||||||
in
|
in
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation (finalAttrs: {
|
||||||
pname = "zeal";
|
pname = "zeal";
|
||||||
version = "0.6.1.20230320";
|
version = "0.6.1.20230907"; # unstable-date format not suitable for cmake
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "zealdocs";
|
owner = "zealdocs";
|
||||||
repo = "zeal";
|
repo = "zeal";
|
||||||
rev = "a617ae5e06b95cec99bae058650e55b98613916d";
|
rev = "20249153077964d01c7c36b9f4042a40e8c8fbf1";
|
||||||
hash = "sha256-WL2uqA0sZ5Q3lZIA9vkLVyfec/jBkfGcWb6XQ7AuM94=";
|
hash = "sha256-AyfpMq0R0ummTGvyUHOh/XBUeVfkFwo1VyyLSGoTN8w=";
|
||||||
};
|
};
|
||||||
|
|
||||||
# we only need this if we are using a version that hasn't been released. We
|
# we only need this if we are using a version that hasn't been released. We
|
||||||
|
@ -36,33 +35,40 @@ stdenv.mkDerivation rec {
|
||||||
# line.
|
# line.
|
||||||
postPatch = ''
|
postPatch = ''
|
||||||
sed -i CMakeLists.txt \
|
sed -i CMakeLists.txt \
|
||||||
-e 's@^project.*@project(Zeal VERSION ${version})@'
|
-e 's@^project.*@project(Zeal VERSION ${finalAttrs.version})@'
|
||||||
'' + lib.optionalString (!isQt5) ''
|
'' + lib.optionalString (!isQt5) ''
|
||||||
substituteInPlace src/app/CMakeLists.txt \
|
substituteInPlace src/app/CMakeLists.txt \
|
||||||
--replace "COMPONENTS Widgets" "COMPONENTS Widgets QmlIntegration"
|
--replace "COMPONENTS Widgets" "COMPONENTS Widgets QmlIntegration"
|
||||||
'';
|
'';
|
||||||
|
|
||||||
nativeBuildInputs = [ cmake extra-cmake-modules pkg-config wrapQtAppsHook ];
|
nativeBuildInputs = [
|
||||||
|
cmake
|
||||||
|
extra-cmake-modules
|
||||||
|
pkg-config
|
||||||
|
wrapQtAppsHook
|
||||||
|
];
|
||||||
|
|
||||||
buildInputs = [
|
buildInputs = [
|
||||||
|
libXdmcp
|
||||||
|
libarchive
|
||||||
|
libpthreadstubs
|
||||||
qtbase
|
qtbase
|
||||||
qtimageformats
|
qtimageformats
|
||||||
qtwebengine
|
qtwebengine
|
||||||
libarchive
|
|
||||||
libXdmcp
|
|
||||||
libpthreadstubs
|
|
||||||
xcbutilkeysyms
|
xcbutilkeysyms
|
||||||
] ++ lib.optionals isQt5 [ qtx11extras ];
|
]
|
||||||
|
++ lib.optionals isQt5 [ qtx11extras ];
|
||||||
|
|
||||||
meta = with lib; {
|
meta = {
|
||||||
description = "A simple offline API documentation browser";
|
description = "A simple offline API documentation browser";
|
||||||
longDescription = ''
|
longDescription = ''
|
||||||
Zeal is a simple offline API documentation browser inspired by Dash (macOS
|
Zeal is a simple offline API documentation browser inspired by Dash (macOS
|
||||||
app), available for Linux and Windows.
|
app), available for Linux and Windows.
|
||||||
'';
|
'';
|
||||||
homepage = "https://zealdocs.org/";
|
homepage = "https://zealdocs.org/";
|
||||||
license = licenses.gpl3;
|
changelog = "https://github.com/zealdocs/zeal/releases";
|
||||||
maintainers = with maintainers; [ skeidel peterhoeg ];
|
license = lib.licenses.gpl3Plus;
|
||||||
platforms = platforms.linux;
|
maintainers = with lib.maintainers; [ skeidel peterhoeg AndersonTorres ];
|
||||||
|
inherit (qtbase.meta) platforms;
|
||||||
};
|
};
|
||||||
}
|
})
|
||||||
|
|
|
@ -30409,8 +30409,10 @@ with pkgs;
|
||||||
};
|
};
|
||||||
|
|
||||||
zeal-qt5 = libsForQt5.callPackage ../data/documentation/zeal { };
|
zeal-qt5 = libsForQt5.callPackage ../data/documentation/zeal { };
|
||||||
zeal-qt6 = qt6Packages.callPackage ../data/documentation/zeal { };
|
|
||||||
zeal = zeal-qt5;
|
zeal = zeal-qt5;
|
||||||
|
zeal-qt6 = qt6Packages.callPackage ../data/documentation/zeal {
|
||||||
|
qtx11extras = null; # Because it does not exist in qt6
|
||||||
|
};
|
||||||
|
|
||||||
zilla-slab = callPackage ../data/fonts/zilla-slab { };
|
zilla-slab = callPackage ../data/fonts/zilla-slab { };
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue