Commit 03b1e9e8 authored by Harinn's avatar Harinn
Browse files

qcad: migrate to by-name

parent 4f29bdf8

pkgs/applications/misc/qcad/default.nix→pkgs/by-name/qc/qcad/package.nix

+16 −23
Original line number Diff line number Diff line
@@ -4,17 +4,10 @@ 
  fetchFromGitHub,

  installShellFiles,

  pkg-config,

  qmake,

  qttools,

  qt5,

  boost,

  libGLU,

  muparser,

  qtbase,

  qtscript,

  qtsvg,

  qtxmlpatterns,

  qtmacextras,

  wrapQtAppsHook,

}:



stdenv.mkDerivation (finalAttrs: {
@@ -35,33 +28,33 @@ stdenv.mkDerivation (finalAttrs: { 
  ];



  postPatch = ''

    if ! [ -d src/3rdparty/qt-labs-qtscriptgenerator-${qtbase.version} ]; then

      mkdir src/3rdparty/qt-labs-qtscriptgenerator-${qtbase.version}

    if ! [ -d src/3rdparty/qt-labs-qtscriptgenerator-${qt5.qtbase.version} ]; then

      mkdir src/3rdparty/qt-labs-qtscriptgenerator-${qt5.qtbase.version}

      cp \

        src/3rdparty/qt-labs-qtscriptgenerator-5.14.0/qt-labs-qtscriptgenerator-5.14.0.pro \

        src/3rdparty/qt-labs-qtscriptgenerator-${qtbase.version}/qt-labs-qtscriptgenerator-${qtbase.version}.pro

        src/3rdparty/qt-labs-qtscriptgenerator-${qt5.qtbase.version}/qt-labs-qtscriptgenerator-${qt5.qtbase.version}.pro

    fi

  '';



  nativeBuildInputs = [

    installShellFiles

    pkg-config

    qmake

    qttools

    wrapQtAppsHook

    qt5.qmake

    qt5.qttools

    qt5.wrapQtAppsHook

  ];



  buildInputs = [

    boost

    libGLU

    muparser

    qtbase

    qtscript

    qtsvg

    qtxmlpatterns

    qt5.qtbase

    qt5.qtscript

    qt5.qtsvg

    qt5.qtxmlpatterns

  ]

  ++ lib.optionals stdenv.hostPlatform.isDarwin [

    qtmacextras

    qt5.qtmacextras

  ];



  qmakeFlags = [
@@ -113,13 +106,13 @@ stdenv.mkDerivation (finalAttrs: { 


    # workaround to fix the library browser:

    rm -r $out/lib/plugins/sqldrivers

    ln -s -t $out/lib/plugins ${qtbase}/${qtbase.qtPluginPrefix}/sqldrivers

    ln -s -t $out/lib/plugins ${qt5.qtbase}/${qt5.qtbase.qtPluginPrefix}/sqldrivers



    rm -r $out/lib/plugins/printsupport

    ln -s -t $out/lib/plugins ${qtbase}/${qtbase.qtPluginPrefix}/printsupport

    ln -s -t $out/lib/plugins ${qt5.qtbase}/${qt5.qtbase.qtPluginPrefix}/printsupport



    rm -r $out/lib/plugins/imageformats

    ln -s -t $out/lib/plugins ${qtbase}/${qtbase.qtPluginPrefix}/imageformats

    ln -s -t $out/lib/plugins ${qt5.qtbase}/${qt5.qtbase.qtPluginPrefix}/imageformats



    install -Dm644 scripts/qcad_icon.svg $out/share/icons/hicolor/scalable/apps/org.qcad.QCAD.svg
@@ -134,6 +127,6 @@ stdenv.mkDerivation (finalAttrs: { 
    license = lib.licenses.gpl3Only;

    mainProgram = "qcad";

    maintainers = with lib.maintainers; [ yvesf ];

    platforms = qtbase.meta.platforms;

    platforms = qt5.qtbase.meta.platforms;

  };

})

pkgs/top-level/all-packages.nix

+0 −2
Original line number Diff line number Diff line
@@ -10689,8 +10689,6 @@ with pkgs; 


  qbittorrent-enhanced-nox = qbittorrent-enhanced.override { guiSupport = false; };



  qcad = libsForQt5.callPackage ../applications/misc/qcad { };



  qctools = libsForQt5.callPackage ../applications/video/qctools { };



  qelectrotech = libsForQt5.callPackage ../applications/misc/qelectrotech { };