summary refs log tree commit diff
diff options
context:
space:
mode:
authorSandro Jäckel <sandro.jaeckel@gmail.com>2022-12-07 02:20:46 +0100
committerSandro Jäckel <sandro.jaeckel@gmail.com>2022-12-07 02:33:30 +0100
commit84e9e1a7ffd05fb61601b74cb731a720e9fec42e (patch)
tree1d9ebfe4ba1f41f5ad64a1a51e7910d7105d8417
parentd26912d7feae36cfe27e00ab4de09b0088dff495 (diff)
downloadnixpkgs-84e9e1a7ffd05fb61601b74cb731a720e9fec42e.tar
nixpkgs-84e9e1a7ffd05fb61601b74cb731a720e9fec42e.tar.gz
nixpkgs-84e9e1a7ffd05fb61601b74cb731a720e9fec42e.tar.bz2
nixpkgs-84e9e1a7ffd05fb61601b74cb731a720e9fec42e.tar.lz
nixpkgs-84e9e1a7ffd05fb61601b74cb731a720e9fec42e.tar.xz
nixpkgs-84e9e1a7ffd05fb61601b74cb731a720e9fec42e.tar.zst
nixpkgs-84e9e1a7ffd05fb61601b74cb731a720e9fec42e.zip
suil: remove qt4 support
-rw-r--r--pkgs/development/libraries/audio/suil/default.nix12
-rw-r--r--pkgs/top-level/all-packages.nix10
2 files changed, 3 insertions, 19 deletions
diff --git a/pkgs/development/libraries/audio/suil/default.nix b/pkgs/development/libraries/audio/suil/default.nix
index ac10472e014..3dc3bb5dacd 100644
--- a/pkgs/development/libraries/audio/suil/default.nix
+++ b/pkgs/development/libraries/audio/suil/default.nix
@@ -1,16 +1,11 @@
 { stdenv, lib, fetchurl, gtk2, lv2, pkg-config, python3, serd, sord, sratom
 , wafHook
-, withQt4 ? true, qt4 ? null
-, withQt5 ? false, qt5 ? null }:
-
-# I haven't found an XOR operator in nix...
-assert withQt4 || withQt5;
-assert !(withQt4 && withQt5);
+, withQt5 ? true, qt5 ? null
+}:
 
 stdenv.mkDerivation rec {
   pname = "suil";
   version = "0.10.6";
-  name = "${pname}-qt${if withQt4 then "4" else "5"}-${version}";
 
   src = fetchurl {
     url = "https://download.drobilla.net/${pname}-${version}.tar.bz2";
@@ -19,8 +14,7 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ pkg-config wafHook python3 ];
   buildInputs = [ gtk2 lv2 serd sord sratom ]
-    ++ (lib.optionals withQt4 [ qt4 ])
-    ++ (lib.optionals withQt5 (with qt5; [ qtbase qttools ]));
+    ++ lib.optionals withQt5 (with qt5; [ qtbase qttools ]);
 
   dontWrapQtApps = true;
 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 708d1aaf2dd..9fdb95eafc8 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -22786,15 +22786,6 @@ with pkgs;
 
   suil = callPackage ../development/libraries/audio/suil { };
 
-  suil-qt5 = suil.override {
-    withQt4 = false;
-    withQt5 = true;
-  };
-  suil-qt4 = suil.override {
-    withQt4 = true;
-    withQt5 = false;
-  };
-
   sundials = callPackage ../development/libraries/sundials {
     python = python3;
   };
@@ -27552,7 +27543,6 @@ with pkgs;
 
   audacity = callPackage ../applications/audio/audacity {
     inherit (darwin.apple_sdk.frameworks) AppKit AudioToolbox AudioUnit Carbon CoreAudio CoreAudioKit CoreServices;
-    suil = suil-qt5;
   };
 
   audio-recorder = callPackage ../applications/audio/audio-recorder { };