gmic-qt: 3.2.1 -> 3.2.2
This commit also removes a few unused arguments and prepares the derivation for qt6 by removing the usage of `qt5.mkDerivation` which is a little broken and likely to be deprecated (see NixOS/nixpkgs#180841).
This commit is contained in:
parent
6d5359557f
commit
126b3d60f6
@ -1,11 +1,12 @@
|
||||
{ lib
|
||||
, mkDerivation
|
||||
, stdenv
|
||||
, variant ? "standalone"
|
||||
, fetchzip
|
||||
, fetchpatch
|
||||
, cmake
|
||||
, pkg-config
|
||||
, ninja
|
||||
, wrapQtAppsHook
|
||||
, opencv3
|
||||
, openexr
|
||||
, graphicsmagick
|
||||
@ -19,12 +20,6 @@
|
||||
, gmic
|
||||
, qtbase
|
||||
, qttools
|
||||
, writeShellScript
|
||||
, common-updater-scripts
|
||||
, gnugrep
|
||||
, gnused
|
||||
, coreutils
|
||||
, jq
|
||||
, nix-update-script
|
||||
, gimpPlugins
|
||||
}:
|
||||
@ -50,20 +45,20 @@ assert lib.assertMsg (builtins.hasAttr variant variants) "gmic-qt variant “${v
|
||||
|
||||
assert lib.assertMsg (builtins.all (d: d != null) variants.${variant}.extraDeps or []) "gmic-qt variant “${variant}” is missing one of its dependencies.";
|
||||
|
||||
mkDerivation rec {
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gmic-qt${lib.optionalString (variant != "standalone") "-${variant}"}";
|
||||
version = "3.2.1";
|
||||
version = "3.2.2";
|
||||
|
||||
src = fetchzip {
|
||||
url = "https://gmic.eu/files/source/gmic_${version}.tar.gz";
|
||||
hash = "sha256-2lMnn19FcFKnfIjSxOObqxIjqLMUoWgi0ADZBCBePY4=";
|
||||
hash = "sha256-Z6FU0BRTiOIoM6ViYgcwOifat4/IISFJXvyC8PwR5mA=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
name = "gmic-qt-3.2.1-fix-system-gmic.patch";
|
||||
url = "https://github.com/c-koi/gmic-qt/commit/e8d7a3523753ff592da63b1d54edf0921c54fe53.patch";
|
||||
hash = "sha256-kBFZo2qvod4pH3oK8gvnmw39x6eMH9zjr4mMcY74mFo=";
|
||||
name = "gmic-3.2.2-cmake-fixes.patch";
|
||||
url = "https://github.com/c-koi/gmic-qt/compare/5379307f9e484ad171b8d09e3572b93d120a9159..420e85e005401d942a3ca5f5c39ee3c867fe8bdd.diff";
|
||||
hash = "sha256-l2y9EFtE3nv8NBSSn6Wo0pLRoYO2hoyb5HZk0QmlSpk=";
|
||||
})
|
||||
];
|
||||
|
||||
@ -73,6 +68,7 @@ mkDerivation rec {
|
||||
cmake
|
||||
pkg-config
|
||||
ninja
|
||||
wrapQtAppsHook
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
|
Loading…
Reference in New Issue
Block a user