Clone of https://github.com/NixOS/nixpkgs.git (to stress-test knotserver)

suil: remove qt4 support

+3 -19
+3 -9
pkgs/development/libraries/audio/suil/default.nix
··· 1 { stdenv, lib, fetchurl, gtk2, lv2, pkg-config, python3, serd, sord, sratom 2 , wafHook 3 - , withQt4 ? true, qt4 ? null 4 - , withQt5 ? false, qt5 ? null }: 5 - 6 - # I haven't found an XOR operator in nix... 7 - assert withQt4 || withQt5; 8 - assert !(withQt4 && withQt5); 9 10 stdenv.mkDerivation rec { 11 pname = "suil"; 12 version = "0.10.6"; 13 - name = "${pname}-qt${if withQt4 then "4" else "5"}-${version}"; 14 15 src = fetchurl { 16 url = "https://download.drobilla.net/${pname}-${version}.tar.bz2"; ··· 19 20 nativeBuildInputs = [ pkg-config wafHook python3 ]; 21 buildInputs = [ gtk2 lv2 serd sord sratom ] 22 - ++ (lib.optionals withQt4 [ qt4 ]) 23 - ++ (lib.optionals withQt5 (with qt5; [ qtbase qttools ])); 24 25 dontWrapQtApps = true; 26
··· 1 { stdenv, lib, fetchurl, gtk2, lv2, pkg-config, python3, serd, sord, sratom 2 , wafHook 3 + , withQt5 ? true, qt5 ? null 4 + }: 5 6 stdenv.mkDerivation rec { 7 pname = "suil"; 8 version = "0.10.6"; 9 10 src = fetchurl { 11 url = "https://download.drobilla.net/${pname}-${version}.tar.bz2"; ··· 14 15 nativeBuildInputs = [ pkg-config wafHook python3 ]; 16 buildInputs = [ gtk2 lv2 serd sord sratom ] 17 + ++ lib.optionals withQt5 (with qt5; [ qtbase qttools ]); 18 19 dontWrapQtApps = true; 20
-10
pkgs/top-level/all-packages.nix
··· 22786 22787 suil = callPackage ../development/libraries/audio/suil { }; 22788 22789 - suil-qt5 = suil.override { 22790 - withQt4 = false; 22791 - withQt5 = true; 22792 - }; 22793 - suil-qt4 = suil.override { 22794 - withQt4 = true; 22795 - withQt5 = false; 22796 - }; 22797 - 22798 sundials = callPackage ../development/libraries/sundials { 22799 python = python3; 22800 }; ··· 27552 27553 audacity = callPackage ../applications/audio/audacity { 27554 inherit (darwin.apple_sdk.frameworks) AppKit AudioToolbox AudioUnit Carbon CoreAudio CoreAudioKit CoreServices; 27555 - suil = suil-qt5; 27556 }; 27557 27558 audio-recorder = callPackage ../applications/audio/audio-recorder { };
··· 22786 22787 suil = callPackage ../development/libraries/audio/suil { }; 22788 22789 sundials = callPackage ../development/libraries/sundials { 22790 python = python3; 22791 }; ··· 27543 27544 audacity = callPackage ../applications/audio/audacity { 27545 inherit (darwin.apple_sdk.frameworks) AppKit AudioToolbox AudioUnit Carbon CoreAudio CoreAudioKit CoreServices; 27546 }; 27547 27548 audio-recorder = callPackage ../applications/audio/audio-recorder { };