Commit f4d38218 authored by Guy Chronister's avatar Guy Chronister Committed by Weijia Wang
Browse files

engauge-digitizer: migrate to by-name

parent 2b7a0a11

pkgs/applications/science/math/engauge-digitizer/default.nix→pkgs/by-name/en/engauge-digitizer/package.nix

+7 −10
Original line number Diff line number Diff line
@@ -7,11 +7,8 @@ 
  log4cpp,

  openjpeg,

  libpng12,

  poppler,

  qtbase,

  libsForQt5,

  qt5,

  qmake,

  wrapQtAppsHook,

}:



stdenv.mkDerivation rec {
@@ -26,14 +23,14 @@ stdenv.mkDerivation rec { 
  };



  nativeBuildInputs = [

    qmake

    wrapQtAppsHook

    qt5.qmake

    qt5.wrapQtAppsHook

  ];



  buildInputs = [

    qtbase

    qt5.qtbase

    qt5.qttools

    poppler

    libsForQt5.poppler

    libpng12

    openjpeg

    openjpeg.dev
@@ -49,9 +46,9 @@ stdenv.mkDerivation rec { 
  ];



  env = {

    POPPLER_INCLUDE = "${poppler.dev}/include/poppler/qt5";

    POPPLER_INCLUDE = "${libsForQt5.poppler.dev}/include/poppler/qt5";



    POPPLER_LIB = "${poppler}/lib";

    POPPLER_LIB = "${libsForQt5.poppler}/lib";



    OPENJPEG_INCLUDE = "${openjpeg.dev}/include/${openjpeg.pname}-${lib.versions.majorMinor openjpeg.version}";

pkgs/top-level/all-packages.nix

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


  dvtm-unstable = callPackage ../tools/misc/dvtm/unstable.nix { };



  engauge-digitizer = libsForQt5.callPackage ../applications/science/math/engauge-digitizer { };



  rocmPackages = recurseIntoAttrs (callPackage ../development/rocm-modules { });



  tsm-client-withGui = callPackage ../by-name/ts/tsm-client/package.nix { enableGui = true; };