From 869eda7c26da9eca03284cfc3efa6743277e878d Mon Sep 17 00:00:00 2001 From: ajs124 Date: Mon, 13 Jun 2022 01:54:49 +0200 Subject: [PATCH] qt-mobility: remove --- .../libraries/qt-mobility/default.nix | 54 ------------------- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 2 - 3 files changed, 1 insertion(+), 56 deletions(-) delete mode 100644 pkgs/development/libraries/qt-mobility/default.nix diff --git a/pkgs/development/libraries/qt-mobility/default.nix b/pkgs/development/libraries/qt-mobility/default.nix deleted file mode 100644 index 7807e41b606e..000000000000 --- a/pkgs/development/libraries/qt-mobility/default.nix +++ /dev/null @@ -1,54 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, qt4, libX11, coreutils, bluez, perl }: -# possible additional dependencies: pulseaudio udev networkmanager immerson qmf - -stdenv.mkDerivation rec { - version = "1.2.0"; - pname = "qt-mobility"; - src = fetchFromGitHub { - owner = "qtproject"; - repo = "qt-mobility"; - rev = "v${version}"; - sha256 = "14713pbscysd6d0b9rgm7gg145jzwvgdn22778pf2v13qzvfmy1i"; - }; - - env.NIX_CFLAGS_COMPILE = "-fpermissive"; - - configurePhase = '' - ./configure -prefix $out - ''; - - # we need to prevent the 'make install' to want to write to ${qt4}! - # according to thiago#qt@freenode these are used for the QML engine - preBuild = '' - for i in connectivity contacts feedback gallery location multimedia organizer publishsubscribe sensors serviceframework systeminfo; do - substituteInPlace plugins/declarative/$i/Makefile --replace "${qt4}/lib/qt4/imports/" "$out/lib/qt4/imports/" - done - ''; - - # Features files (*.prf) are not installed on nixos - # https://bugreports.qt-project.org/browse/QTMOBILITY-1085 - # - features/mobility.prf (/tmp/nix-build-9kh12nhf9cyplfwiws96gz414v6wgl67-qt-mobility-1.2.0.drv-0/qt-mobility-opensource-src-1.2.0) - - patchPhase = '' - # required to make the configure script work - substituteInPlace configure --replace "/bin/pwd" "${coreutils}/bin/pwd" - - # required to make /include generator work - substituteInPlace bin/syncheaders --replace "/usr/bin/perl" "${perl}/bin/perl" - - # required to make the -prefix variable parsing work - substituteInPlace bin/pathhelper --replace "/usr/bin/perl" "${perl}/bin/perl" - ''; - - buildInputs = [ qt4 libX11 bluez perl ]; - - meta = with lib; { - description = "Qt Mobility"; - homepage = "http://qt.nokia.com/products/qt-addons/mobility"; - maintainers = [ maintainers.qknight ]; - platforms = platforms.linux; - license = with licenses; [ bsd3 fdl13Plus gpl3Plus lgpl21Plus ]; - }; -} - - diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index beb3355bfe07..99e630a719c4 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -1504,6 +1504,7 @@ mapAliases ({ qtcurve = libsForQt5.qtcurve; # Added 2020-11-07 qtile-unwrapped = python3.pkgs.qtile; # Added 2023-05-12 qtkeychain = throw "the qtkeychain attribute (qt4 version) has been removes, use the qt5 version: libsForQt5.qtkeychain"; # Added 2021-08-04 + qt-mobility = throw "qt-mobility has been removed, because it depended on qt4"; # Added 2022-06-13 qtscriptgenerator = throw "'qtscriptgenerator' (Qt4) is unmaintained upstream and not used in nixpkgs"; # Added 2022-06-14 qtstyleplugin-kvantum-qt4 = throw "qtstyleplugin-kvantum-qt4 has been removed, because it depended on qt4"; # Added 2022-05-26 quagga = throw "quagga is no longer maintained upstream"; # Added 2021-04-22 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7931adc14ff2..674fae0ec8ed 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -21909,8 +21909,6 @@ with pkgs; gusb = callPackage ../development/libraries/gusb { }; - qt-mobility = callPackage ../development/libraries/qt-mobility { }; - qxmpp = libsForQt5.callPackage ../development/libraries/qxmpp { }; gnet = callPackage ../development/libraries/gnet { };