From cf0862e525546119835b212e72754968b5e2ef5d Mon Sep 17 00:00:00 2001 From: ajs124 <git@ajs124.de> Date: Thu, 26 May 2022 03:31:01 +0200 Subject: [PATCH] qwt6_qt4: remove --- pkgs/development/libraries/qwt/6_qt4.nix | 42 ------------------------ pkgs/top-level/all-packages.nix | 4 --- 2 files changed, 46 deletions(-) delete mode 100644 pkgs/development/libraries/qwt/6_qt4.nix diff --git a/pkgs/development/libraries/qwt/6_qt4.nix b/pkgs/development/libraries/qwt/6_qt4.nix deleted file mode 100644 index 021fa0ba57d4..000000000000 --- a/pkgs/development/libraries/qwt/6_qt4.nix +++ /dev/null @@ -1,42 +0,0 @@ -{ lib, stdenv, fetchurl, qt4, qmake4Hook, AGL }: - -stdenv.mkDerivation rec { - pname = "qwt"; - version = "6.1.5"; - - src = fetchurl { - url = "mirror://sourceforge/qwt/qwt-${version}.tar.bz2"; - sha256 = "0hf0mpca248xlqn7xnzkfj8drf19gdyg5syzklvq8pibxiixwxj0"; - }; - - buildInputs = [ - qt4 - ] ++ lib.optionals stdenv.isDarwin [ AGL ]; - - nativeBuildInputs = [ qmake4Hook ]; - - enableParallelBuilding = true; - - postPatch = '' - sed -e "s|QWT_INSTALL_PREFIX.*=.*|QWT_INSTALL_PREFIX = $out|g" -i qwtconfig.pri - ''; - - # qwt.framework output includes a relative reference to itself, which breaks dependents - preFixup = - lib.optionalString stdenv.isDarwin '' - echo "Attempting to repair qwt" - install_name_tool -id "$out/lib/qwt.framework/Versions/6/qwt" "$out/lib/qwt.framework/Versions/6/qwt" - ''; - - qmakeFlags = [ "-after doc.path=$out/share/doc/qwt-${version}" ]; - - meta = with lib; { - description = "Qt widgets for technical applications"; - homepage = "http://qwt.sourceforge.net/"; - # LGPL 2.1 plus a few exceptions (more liberal) - license = lib.licenses.qwt; - platforms = platforms.linux ++ platforms.darwin; - maintainers = [ maintainers.bjornfor ]; - branch = "6"; - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4dc217250803..a08b5dc93a09 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -24859,10 +24859,6 @@ with pkgs; qv2ray = libsForQt5.callPackage ../applications/networking/qv2ray { }; - qwt6_qt4 = callPackage ../development/libraries/qwt/6_qt4.nix { - inherit (darwin.apple_sdk.frameworks) AGL; - }; - rabbitmq-c = callPackage ../development/libraries/rabbitmq-c { }; raft-canonical = callPackage ../development/libraries/raft-canonical { };