diff options
Diffstat (limited to 'nixpkgs/pkgs/kde/gear')
32 files changed, 145 insertions, 82 deletions
diff --git a/nixpkgs/pkgs/kde/gear/accessibility-inspector/default.nix b/nixpkgs/pkgs/kde/gear/accessibility-inspector/default.nix new file mode 100644 index 000000000000..1197f2933008 --- /dev/null +++ b/nixpkgs/pkgs/kde/gear/accessibility-inspector/default.nix @@ -0,0 +1,4 @@ +{mkKdeDerivation}: +mkKdeDerivation { + pname = "accessibility-inspector"; +} diff --git a/nixpkgs/pkgs/kde/gear/akonadi-search/default.nix b/nixpkgs/pkgs/kde/gear/akonadi-search/default.nix index 416dd91a9ee5..a05705b43fe8 100644 --- a/nixpkgs/pkgs/kde/gear/akonadi-search/default.nix +++ b/nixpkgs/pkgs/kde/gear/akonadi-search/default.nix @@ -7,7 +7,7 @@ cargo, rustc, # provided as callPackage input to enable easier overrides through overlays - cargoHash ? "sha256-fY0mQiYS/CMThOVsWp8NgxpWfUph2dZ7hj7W5JUJ2J4=", + cargoHash ? "sha256-fSue83tCE1TqaEfp1dxlRblxzJQUTNIQMYA5fXcaDqc=", }: mkKdeDerivation rec { pname = "akonadi-search"; diff --git a/nixpkgs/pkgs/kde/gear/angelfish/default.nix b/nixpkgs/pkgs/kde/gear/angelfish/default.nix index 0d9b4a341f05..ebf61e122d9b 100644 --- a/nixpkgs/pkgs/kde/gear/angelfish/default.nix +++ b/nixpkgs/pkgs/kde/gear/angelfish/default.nix @@ -8,7 +8,7 @@ cargo, rustc, # provided as callPackage input to enable easier overrides through overlays - cargoHash ? "sha256-QJZJqdixPThgiKnruKetmzhbvtY/MsGy4v+OdQiEFR8=", + cargoHash ? "sha256-Y0aG8NgiDTbDYgh8hMxfwSCHFh8f7PGABxw10m07dgs=", qcoro, }: mkKdeDerivation rec { diff --git a/nixpkgs/pkgs/kde/gear/audex/default.nix b/nixpkgs/pkgs/kde/gear/audex/default.nix new file mode 100644 index 000000000000..c6043d641608 --- /dev/null +++ b/nixpkgs/pkgs/kde/gear/audex/default.nix @@ -0,0 +1,10 @@ +{ + mkKdeDerivation, + libcdio, + libcdio-paranoia, +}: +mkKdeDerivation { + pname = "audex"; + + extraBuildInputs = [libcdio libcdio-paranoia]; +} diff --git a/nixpkgs/pkgs/kde/gear/bovo/default.nix b/nixpkgs/pkgs/kde/gear/bovo/default.nix index 9e8ae9b05153..5bafedfd1b14 100644 --- a/nixpkgs/pkgs/kde/gear/bovo/default.nix +++ b/nixpkgs/pkgs/kde/gear/bovo/default.nix @@ -1,10 +1,13 @@ { mkKdeDerivation, qtsvg, + _7zz, }: mkKdeDerivation { pname = "bovo"; + extraNativeBuildInputs = [_7zz]; extraBuildInputs = [qtsvg]; + meta.mainProgram = "bovo"; } diff --git a/nixpkgs/pkgs/kde/gear/calindori/default.nix b/nixpkgs/pkgs/kde/gear/calindori/default.nix index f0b21c7986a7..41efa7a9e48f 100644 --- a/nixpkgs/pkgs/kde/gear/calindori/default.nix +++ b/nixpkgs/pkgs/kde/gear/calindori/default.nix @@ -1,15 +1,9 @@ { mkKdeDerivation, qtsvg, - qqc2-desktop-style, }: mkKdeDerivation { pname = "calindori"; - extraBuildInputs = [ - qtsvg - qqc2-desktop-style - ]; - # FIXME(qt5) - meta.broken = true; + extraBuildInputs = [qtsvg]; } diff --git a/nixpkgs/pkgs/kde/gear/default.nix b/nixpkgs/pkgs/kde/gear/default.nix index 1ffcdc770e21..b0560b868ee3 100644 --- a/nixpkgs/pkgs/kde/gear/default.nix +++ b/nixpkgs/pkgs/kde/gear/default.nix @@ -1,4 +1,5 @@ {callPackage}: { + accessibility-inspector = callPackage ./accessibility-inspector {}; akonadi = callPackage ./akonadi {}; akonadi-calendar = callPackage ./akonadi-calendar {}; akonadi-calendar-tools = callPackage ./akonadi-calendar-tools {}; @@ -15,6 +16,7 @@ arianna = callPackage ./arianna {}; ark = callPackage ./ark {}; artikulate = callPackage ./artikulate {}; + audex = callPackage ./audex {}; audiocd-kio = callPackage ./audiocd-kio {}; audiotube = callPackage ./audiotube {}; baloo-widgets = callPackage ./baloo-widgets {}; @@ -34,6 +36,7 @@ falkon = callPackage ./falkon {}; ffmpegthumbs = callPackage ./ffmpegthumbs {}; filelight = callPackage ./filelight {}; + francis = callPackage ./francis {}; ghostwriter = callPackage ./ghostwriter {}; granatier = callPackage ./granatier {}; grantlee-editor = callPackage ./grantlee-editor {}; @@ -51,6 +54,7 @@ kalarm = callPackage ./kalarm {}; kalgebra = callPackage ./kalgebra {}; kalk = callPackage ./kalk {}; + kalm = callPackage ./kalm {}; kalzium = callPackage ./kalzium {}; kamera = callPackage ./kamera {}; kamoso = callPackage ./kamoso {}; @@ -112,7 +116,6 @@ kimap = callPackage ./kimap {}; kio-admin = callPackage ./kio-admin {}; kio-extras = callPackage ./kio-extras {}; - kio-extras-kf5 = callPackage ./kio-extras-kf5 {}; kio-gdrive = callPackage ./kio-gdrive {}; kio-zeroconf = callPackage ./kio-zeroconf {}; kipi-plugins = callPackage ./kipi-plugins {}; @@ -236,6 +239,7 @@ signon-kwallet-extension = callPackage ./signon-kwallet-extension {}; skanlite = callPackage ./skanlite {}; skanpage = callPackage ./skanpage {}; + skladnik = callPackage ./skladnik {}; spectacle = callPackage ./spectacle {}; step = callPackage ./step {}; svgpart = callPackage ./svgpart {}; diff --git a/nixpkgs/pkgs/kde/gear/francis/default.nix b/nixpkgs/pkgs/kde/gear/francis/default.nix new file mode 100644 index 000000000000..f17f21c8ea21 --- /dev/null +++ b/nixpkgs/pkgs/kde/gear/francis/default.nix @@ -0,0 +1,9 @@ +{ + mkKdeDerivation, + qtsvg, +}: +mkKdeDerivation { + pname = "francis"; + + extraBuildInputs = [qtsvg]; +} diff --git a/nixpkgs/pkgs/kde/gear/kalm/default.nix b/nixpkgs/pkgs/kde/gear/kalm/default.nix new file mode 100644 index 000000000000..0c4eee90bc31 --- /dev/null +++ b/nixpkgs/pkgs/kde/gear/kalm/default.nix @@ -0,0 +1,4 @@ +{mkKdeDerivation}: +mkKdeDerivation { + pname = "kalm"; +} diff --git a/nixpkgs/pkgs/kde/gear/katomic/default.nix b/nixpkgs/pkgs/kde/gear/katomic/default.nix index 9a0f9b743d9e..e9dcd6ebe040 100644 --- a/nixpkgs/pkgs/kde/gear/katomic/default.nix +++ b/nixpkgs/pkgs/kde/gear/katomic/default.nix @@ -1,5 +1,11 @@ -{mkKdeDerivation}: +{ + mkKdeDerivation, + _7zz +}: mkKdeDerivation { pname = "katomic"; + + extraNativeBuildInputs = [_7zz]; + meta.mainProgram = "katomic"; } diff --git a/nixpkgs/pkgs/kde/gear/kblackbox/default.nix b/nixpkgs/pkgs/kde/gear/kblackbox/default.nix index 3f8995ce537e..26156c9195a9 100644 --- a/nixpkgs/pkgs/kde/gear/kblackbox/default.nix +++ b/nixpkgs/pkgs/kde/gear/kblackbox/default.nix @@ -1,10 +1,13 @@ { mkKdeDerivation, qtsvg, + _7zz, }: mkKdeDerivation { pname = "kblackbox"; + extraNativeBuildInputs = [_7zz]; extraBuildInputs = [qtsvg]; + meta.mainProgram = "kblackbox"; } diff --git a/nixpkgs/pkgs/kde/gear/kbounce/default.nix b/nixpkgs/pkgs/kde/gear/kbounce/default.nix index 8ddeef47bfb6..e93c9e50d673 100644 --- a/nixpkgs/pkgs/kde/gear/kbounce/default.nix +++ b/nixpkgs/pkgs/kde/gear/kbounce/default.nix @@ -1,10 +1,13 @@ { mkKdeDerivation, qtsvg, + _7zz, }: mkKdeDerivation { pname = "kbounce"; + extraNativeBuildInputs = [_7zz]; extraBuildInputs = [qtsvg]; + meta.mainProgram = "kbounce"; } diff --git a/nixpkgs/pkgs/kde/gear/kdenlive/default.nix b/nixpkgs/pkgs/kde/gear/kdenlive/default.nix index 49643826b9e2..fe5f7e4c13b1 100644 --- a/nixpkgs/pkgs/kde/gear/kdenlive/default.nix +++ b/nixpkgs/pkgs/kde/gear/kdenlive/default.nix @@ -4,12 +4,14 @@ qtsvg, qtmultimedia, qtnetworkauth, + qqc2-desktop-style, ffmpeg-full, mediainfo, mlt, shared-mime-info, libv4l, frei0r, + fetchpatch, }: mkKdeDerivation { pname = "kdenlive"; @@ -22,6 +24,13 @@ mkKdeDerivation { ffmpeg = ffmpeg-full; } ) + + # Backport fix for crash after 5 minutes + # FIXME: remove in next release + (fetchpatch { + url = "https://invent.kde.org/multimedia/kdenlive/-/commit/8be0e826471332bb739344ebe1859298c46e9e0f.patch"; + hash = "sha256-5hLePH5NlO4Lx8lg9kjBPI4jTmP666RGplaVCmS/9TA="; + }) ]; extraBuildInputs = [ @@ -29,6 +38,8 @@ mkKdeDerivation { qtmultimedia qtnetworkauth + qqc2-desktop-style + mlt shared-mime-info libv4l diff --git a/nixpkgs/pkgs/kde/gear/kdepim-addons/default.nix b/nixpkgs/pkgs/kde/gear/kdepim-addons/default.nix index fded9e9b0205..a11c50f9df1f 100644 --- a/nixpkgs/pkgs/kde/gear/kdepim-addons/default.nix +++ b/nixpkgs/pkgs/kde/gear/kdepim-addons/default.nix @@ -8,7 +8,7 @@ corrosion, alpaka, # provided as callPackage input to enable easier overrides through overlays - cargoHash ? "sha256-Yt1Gxw9Q1Q108YRJoUIpeNZlGjZ7yabLW3bRO4+x6Vo=", + cargoHash ? "sha256-uFQhxNpH9KG5+27EZNBwDX2sswd1nI86bESeeOnPXA4=", }: mkKdeDerivation rec { pname = "kdepim-addons"; diff --git a/nixpkgs/pkgs/kde/gear/kfourinline/default.nix b/nixpkgs/pkgs/kde/gear/kfourinline/default.nix index 5e1d6fba0ef0..2c77d372fc16 100644 --- a/nixpkgs/pkgs/kde/gear/kfourinline/default.nix +++ b/nixpkgs/pkgs/kde/gear/kfourinline/default.nix @@ -1,9 +1,11 @@ { mkKdeDerivation, qtsvg, + _7zz, }: mkKdeDerivation { pname = "kfourinline"; + extraNativeBuildInputs = [_7zz]; extraBuildInputs = [qtsvg]; } diff --git a/nixpkgs/pkgs/kde/gear/kio-extras-kf5/default.nix b/nixpkgs/pkgs/kde/gear/kio-extras-kf5/default.nix deleted file mode 100644 index d92f7a61b8a2..000000000000 --- a/nixpkgs/pkgs/kde/gear/kio-extras-kf5/default.nix +++ /dev/null @@ -1,62 +0,0 @@ -{ - stdenv, - sources, - kio-extras, - cmake, - libsForQt5, - samba, - libssh, - libmtp, - libimobiledevice, - gperf, - libtirpc, - openexr, - taglib, - libappimage, -}: -stdenv.mkDerivation rec { - pname = "kio-extras-kf5"; - inherit (sources.${pname}) version; - - src = sources.${pname}; - - nativeBuildInputs = with libsForQt5; [ - cmake - extra-cmake-modules - wrapQtAppsHook - ]; - - buildInputs = with libsForQt5; [ - qtbase - - kactivities - kactivities-stats - karchive - kconfig - kconfigwidgets - kcoreaddons - kdbusaddons - kdnssd - kdoctools - kdsoap - kguiaddons - ki18n - kio - libkexiv2 - phonon - solid - syntax-highlighting - - samba - libssh - libmtp - libimobiledevice - gperf - libtirpc - openexr - taglib - libappimage - ]; - - meta = kio-extras.meta; -} diff --git a/nixpkgs/pkgs/kde/gear/kjumpingcube/default.nix b/nixpkgs/pkgs/kde/gear/kjumpingcube/default.nix index 1f1daf12d234..0141748b39dc 100644 --- a/nixpkgs/pkgs/kde/gear/kjumpingcube/default.nix +++ b/nixpkgs/pkgs/kde/gear/kjumpingcube/default.nix @@ -1,10 +1,13 @@ { mkKdeDerivation, qtsvg, + _7zz, }: mkKdeDerivation { pname = "kjumpingcube"; + extraNativeBuildInputs = [_7zz]; extraBuildInputs = [qtsvg]; + meta.mainProgram = "kjumpingcube"; } diff --git a/nixpkgs/pkgs/kde/gear/klickety/default.nix b/nixpkgs/pkgs/kde/gear/klickety/default.nix index 574bddccf00b..339fa31003a5 100644 --- a/nixpkgs/pkgs/kde/gear/klickety/default.nix +++ b/nixpkgs/pkgs/kde/gear/klickety/default.nix @@ -1,5 +1,11 @@ -{mkKdeDerivation}: +{ + mkKdeDerivation, + _7zz, +}: mkKdeDerivation { pname = "klickety"; + + extraNativeBuildInputs = [_7zz]; + meta.mainProgram = "klickety"; } diff --git a/nixpkgs/pkgs/kde/gear/klines/default.nix b/nixpkgs/pkgs/kde/gear/klines/default.nix index 58a8f6f8c465..52bb95c0d787 100644 --- a/nixpkgs/pkgs/kde/gear/klines/default.nix +++ b/nixpkgs/pkgs/kde/gear/klines/default.nix @@ -1,5 +1,11 @@ -{mkKdeDerivation}: +{ + mkKdeDerivation, + _7zz, +}: mkKdeDerivation { pname = "klines"; + + extraNativeBuildInputs = [_7zz]; + meta.mainProgram = "klines"; } diff --git a/nixpkgs/pkgs/kde/gear/kmines/default.nix b/nixpkgs/pkgs/kde/gear/kmines/default.nix index 5c333ae11da5..687cf0d29480 100644 --- a/nixpkgs/pkgs/kde/gear/kmines/default.nix +++ b/nixpkgs/pkgs/kde/gear/kmines/default.nix @@ -1,5 +1,11 @@ -{mkKdeDerivation}: +{ + mkKdeDerivation, + _7zz, +}: mkKdeDerivation { pname = "kmines"; + + extraNativeBuildInputs = [_7zz]; + meta.mainProgram = "kmines"; } diff --git a/nixpkgs/pkgs/kde/gear/knavalbattle/default.nix b/nixpkgs/pkgs/kde/gear/knavalbattle/default.nix index 3168f2b5729c..abd9281ff52e 100644 --- a/nixpkgs/pkgs/kde/gear/knavalbattle/default.nix +++ b/nixpkgs/pkgs/kde/gear/knavalbattle/default.nix @@ -1,5 +1,11 @@ -{mkKdeDerivation}: +{ + mkKdeDerivation, + _7zz, +}: mkKdeDerivation { pname = "knavalbattle"; + + extraNativeBuildInputs = [_7zz]; + meta.mainProgram = "knavalbattle"; } diff --git a/nixpkgs/pkgs/kde/gear/kolf/default.nix b/nixpkgs/pkgs/kde/gear/kolf/default.nix index 51a31e5e753a..39657f077a7d 100644 --- a/nixpkgs/pkgs/kde/gear/kolf/default.nix +++ b/nixpkgs/pkgs/kde/gear/kolf/default.nix @@ -1,5 +1,11 @@ -{mkKdeDerivation}: +{ + mkKdeDerivation, + _7zz, +}: mkKdeDerivation { pname = "kolf"; + + extraNativeBuildInputs = [_7zz]; + meta.mainProgram = "kolf"; } diff --git a/nixpkgs/pkgs/kde/gear/kollision/default.nix b/nixpkgs/pkgs/kde/gear/kollision/default.nix index f8e816437bb4..299549d47513 100644 --- a/nixpkgs/pkgs/kde/gear/kollision/default.nix +++ b/nixpkgs/pkgs/kde/gear/kollision/default.nix @@ -1,5 +1,11 @@ -{mkKdeDerivation}: +{ + mkKdeDerivation, + _7zz, +}: mkKdeDerivation { pname = "kollision"; + + extraNativeBuildInputs = [_7zz]; + meta.mainProgram = "kollision"; } diff --git a/nixpkgs/pkgs/kde/gear/kreversi/default.nix b/nixpkgs/pkgs/kde/gear/kreversi/default.nix index facc50b28b15..3f5591c299b6 100644 --- a/nixpkgs/pkgs/kde/gear/kreversi/default.nix +++ b/nixpkgs/pkgs/kde/gear/kreversi/default.nix @@ -1,10 +1,13 @@ { mkKdeDerivation, qtsvg, + _7zz, }: mkKdeDerivation { pname = "kreversi"; + extraNativeBuildInputs = [_7zz]; extraBuildInputs = [qtsvg]; + meta.mainProgram = "kreversi"; } diff --git a/nixpkgs/pkgs/kde/gear/krfb/default.nix b/nixpkgs/pkgs/kde/gear/krfb/default.nix index 03789537f63e..3ab41fcc4f51 100644 --- a/nixpkgs/pkgs/kde/gear/krfb/default.nix +++ b/nixpkgs/pkgs/kde/gear/krfb/default.nix @@ -1,7 +1,9 @@ { mkKdeDerivation, + pkg-config, qtwayland, libvncserver, + pipewire, xorg, }: mkKdeDerivation { @@ -11,5 +13,6 @@ mkKdeDerivation { "-DQtWaylandScanner_EXECUTABLE=${qtwayland}/libexec/qtwaylandscanner" ]; - extraBuildInputs = [qtwayland libvncserver xorg.libXdamage]; + extraNativeBuildInputs = [pkg-config]; + extraBuildInputs = [qtwayland libvncserver pipewire xorg.libXdamage]; } diff --git a/nixpkgs/pkgs/kde/gear/ksudoku/default.nix b/nixpkgs/pkgs/kde/gear/ksudoku/default.nix index b11d44f488f9..15ac4e2ce4f8 100644 --- a/nixpkgs/pkgs/kde/gear/ksudoku/default.nix +++ b/nixpkgs/pkgs/kde/gear/ksudoku/default.nix @@ -1,10 +1,13 @@ { mkKdeDerivation, qtsvg, + _7zz, }: mkKdeDerivation { pname = "ksudoku"; extraBuildInputs = [qtsvg]; + extraNativeBuildInputs = [_7zz]; + meta.mainProgram = "ksudoku"; } diff --git a/nixpkgs/pkgs/kde/gear/kubrick/default.nix b/nixpkgs/pkgs/kde/gear/kubrick/default.nix index d5ca09e42887..a194ebae5b68 100644 --- a/nixpkgs/pkgs/kde/gear/kubrick/default.nix +++ b/nixpkgs/pkgs/kde/gear/kubrick/default.nix @@ -1,11 +1,14 @@ { mkKdeDerivation, qtsvg, + _7zz, libGLU, }: mkKdeDerivation { pname = "kubrick"; + extraNativeBuildInputs = [_7zz]; extraBuildInputs = [qtsvg libGLU]; + meta.mainProgram = "kubrick"; } diff --git a/nixpkgs/pkgs/kde/gear/lskat/default.nix b/nixpkgs/pkgs/kde/gear/lskat/default.nix index 131cb34c0365..eefb95f9e1b4 100644 --- a/nixpkgs/pkgs/kde/gear/lskat/default.nix +++ b/nixpkgs/pkgs/kde/gear/lskat/default.nix @@ -1,10 +1,13 @@ { mkKdeDerivation, qtsvg, + _7zz, }: mkKdeDerivation { pname = "lskat"; + extraNativeBuildInputs = [_7zz]; extraBuildInputs = [qtsvg]; + meta.mainProgram = "lskat"; } diff --git a/nixpkgs/pkgs/kde/gear/picmi/default.nix b/nixpkgs/pkgs/kde/gear/picmi/default.nix index 8838b657bc47..341cd3922aff 100644 --- a/nixpkgs/pkgs/kde/gear/picmi/default.nix +++ b/nixpkgs/pkgs/kde/gear/picmi/default.nix @@ -1,10 +1,13 @@ { mkKdeDerivation, qtsvg, + _7zz, }: mkKdeDerivation { pname = "picmi"; + extraNativeBuildInputs = [_7zz]; extraBuildInputs = [qtsvg]; + meta.mainProgram = "picmi"; } diff --git a/nixpkgs/pkgs/kde/gear/skanpage/default.nix b/nixpkgs/pkgs/kde/gear/skanpage/default.nix index b6db869472cf..c855041220c9 100644 --- a/nixpkgs/pkgs/kde/gear/skanpage/default.nix +++ b/nixpkgs/pkgs/kde/gear/skanpage/default.nix @@ -1,5 +1,6 @@ { mkKdeDerivation, + qtwebengine, tesseractLanguages ? [], tesseract5, leptonica, @@ -8,6 +9,7 @@ mkKdeDerivation { pname = "skanpage"; extraBuildInputs = [ + qtwebengine (tesseract5.override {enableLanguages = tesseractLanguages;}) leptonica ]; diff --git a/nixpkgs/pkgs/kde/gear/skladnik/default.nix b/nixpkgs/pkgs/kde/gear/skladnik/default.nix new file mode 100644 index 000000000000..ae4dd03f3e3c --- /dev/null +++ b/nixpkgs/pkgs/kde/gear/skladnik/default.nix @@ -0,0 +1,4 @@ +{mkKdeDerivation}: +mkKdeDerivation { + pname = "skladnik"; +} diff --git a/nixpkgs/pkgs/kde/gear/spectacle/default.nix b/nixpkgs/pkgs/kde/gear/spectacle/default.nix index 3232b6402bd0..dba026d22f24 100644 --- a/nixpkgs/pkgs/kde/gear/spectacle/default.nix +++ b/nixpkgs/pkgs/kde/gear/spectacle/default.nix @@ -2,10 +2,19 @@ mkKdeDerivation, qtwayland, qtmultimedia, + opencv, }: mkKdeDerivation { pname = "spectacle"; - extraBuildInputs = [qtwayland qtmultimedia]; + extraBuildInputs = [ + qtwayland + qtmultimedia + (opencv.override { + enableCuda = false; # fails to compile, disabled in case someone sets config.cudaSupport + enabledModules = [ "core" "imgproc" ]; # https://invent.kde.org/graphics/spectacle/-/blob/master/CMakeLists.txt?ref_type=heads#L83 + runAccuracyTests = false; # tests will fail because of missing plugins but that's okay + }) + ]; meta.mainProgram = "spectacle"; } |