Commit 138eebe5 authored by Doron Behar's avatar Doron Behar
Browse files

qscintilla: move to qt{5,6}Packages.nix 

Since it is a somewhat common library, with support for multiple qt
versions, it is safer to put each version of it in libsForQt5 and
qt6Packages attribute sets. Also, it is cleaner to put the darwin
if-else inside the expression, in relation to https://github.com/NixOS/rfcs/pull/140 .
parent 8ace65ff

pkgs/applications/audio/miniaudicle/default.nix

+2 −2
Original line number Diff line number Diff line
@@ -3,7 +3,7 @@ 
, fetchFromGitHub

, qmake

, wrapQtAppsHook

, qscintilla-qt6

, qt6Packages

, bison

, flex

, which
@@ -45,7 +45,7 @@ stdenv.mkDerivation (finalAttrs: { 
  buildInputs = [

    alsa-lib

    libsndfile

    qscintilla-qt6

    qt6Packages.qscintilla

  ] ++ lib.optional (audioBackend == "pulse") libpulseaudio

    ++ lib.optional (audioBackend == "jack")  libjack2;

pkgs/development/interpreters/octave/default.nix

+7 −8
Original line number Diff line number Diff line
@@ -50,8 +50,7 @@ 
, makeWrapper

# - Build Octave Qt GUI:

, enableQt ? false

, qt5

, qscintilla

, libsForQt5

, libiconv

, darwin

}:
@@ -132,9 +131,9 @@ in stdenv.mkDerivation (finalAttrs: { 
      gnuplot

      python3

    ] ++ lib.optionals enableQt [

      qt5.qtbase

      qt5.qtsvg

      qscintilla

      libsForQt5.qtbase

      libsForQt5.qtsvg

      libsForQt5.qscintilla

    ] ++ lib.optionals (enableJava) [

      jdk

    ] ++ lib.optionals (!stdenv.isDarwin) [
@@ -149,9 +148,9 @@ in stdenv.mkDerivation (finalAttrs: { 
      gfortran

      texinfo

    ] ++ lib.optionals enableQt [

      qt5.wrapQtAppsHook

      qt5.qtscript

      qt5.qttools

      libsForQt5.wrapQtAppsHook

      libsForQt5.qtscript

      libsForQt5.qttools

    ];



    doCheck = !stdenv.isDarwin;

pkgs/development/libraries/qscintilla/default.nix

+8 −1
Original line number Diff line number Diff line
@@ -6,9 +6,16 @@ 
, qtmacextras ? null

, qmake

, fixDarwinDylibNames

, darwin

}:



stdenv.mkDerivation rec {

let

  stdenv' = if stdenv.isDarwin then

    darwin.apple_sdk_11_0.stdenv

  else

    stdenv

  ;

in stdenv'.mkDerivation rec {

  pname = "qscintilla-qt5";

  version = "2.13.2";

pkgs/top-level/aliases.nix

+2 −0
Original line number Diff line number Diff line
@@ -1518,6 +1518,8 @@ mapAliases ({ 
  qlandkartegt = throw "'qlandkartegt' has been removed from nixpkgs, as it was broken and unmaintained"; # Added 2023-04-17

  qr-filetransfer = throw ''"qr-filetransfer" has been renamed to "qrcp"''; # Added 2020-12-02

  qshowdiff = throw "'qshowdiff' (Qt4) is unmaintained and not been updated since its addition in 2010"; # Added 2022-06-14

  qscintilla = libsForQt5.qscintilla; # Added 2023-09-20

  qscintilla-qt6 = qt6Packages.qscintilla; # Added 2023-09-20

  qtscrobbler = throw "qtscrobbler has been removed, because it was unmaintained"; # Added 2022-05-26

  qt-3 = throw "qt-3 has been removed from nixpkgs, as it's unmaintained and insecure"; # Added 2021-02-15

  qt512 = throw "Qt 5 versions prior to 5.15 are no longer supported upstream and have been removed";  # Added 2022-11-24

pkgs/top-level/all-packages.nix

+0 −6
Original line number Diff line number Diff line
@@ -12478,12 +12478,6 @@ with pkgs; 














  qprint = callPackage ../tools/text/qprint { };



























  qscintilla = libsForQt5.callPackage ../development/libraries/qscintilla {













    stdenv = if stdenv.isDarwin then darwin.apple_sdk_11_0.stdenv else stdenv;













  };

























  qscintilla-qt6 = qt6Packages.callPackage ../development/libraries/qscintilla { };



























  qrcp = callPackage ../tools/networking/qrcp { };





























  qrscan = callPackage ../tools/misc/qrscan { };