Unverified Commit 981216bb authored by Emily Trau's avatar Emily Trau Committed by GitHub
Browse files

detect-it-easy: 3.09 -> 3.10 (#353539)

parents 6f42eff1 ba13a161

pkgs/by-name/de/detect-it-easy/0001-remove-hard-coded-paths-in-xoptions.patch

+4 −4
Original line number Diff line number Diff line 
diff --git a/XOptions/xoptions.cpp b/XOptions/xoptions.cpp

index ca5723e..30574a5 100755

index 8c887c3..36cdbc3 100755

--- a/XOptions/xoptions.cpp

+++ b/XOptions/xoptions.cpp

@@ -1531,14 +1531,7 @@ bool XOptions::checkNative(const QString &sIniFileName)

@@ -1754,14 +1754,7 @@ bool XOptions::checkNative(const QString &sIniFileName)

 #if defined(Q_OS_MAC)

     bResult = true;

 #elif defined(Q_OS_LINUX) || defined(Q_OS_FREEBSD)

-    QString sApplicationDirPath = qApp->applicationDirPath();

-

-    if ((sApplicationDirPath == "/bin") || (sApplicationDirPath == "/usr/bin") || (sApplicationDirPath == "/usr/local/bin") ||

-    if ((sApplicationDirPath == "/bin") || (sApplicationDirPath == "/usr/bin") || (sApplicationDirPath == "/usr/local/bin") || (sApplicationDirPath == "/app/bin") ||

-        (sApplicationDirPath.contains("/usr/local/bin$")) || isAppImage()) {

-        bResult = true;

-    } else {
@@ -18,7 +18,7 @@ index ca5723e..30574a5 100755 
 #elif defined(Q_OS_WIN)

     QString sApplicationDirPath = qApp->applicationDirPath();

 

@@ -1565,22 +1558,7 @@ QString XOptions::getApplicationDataPath()

@@ -1788,22 +1781,7 @@ QString XOptions::getApplicationDataPath()

 #ifdef Q_OS_MAC

     sResult = sApplicationDirPath + "/../Resources";

 #elif defined(Q_OS_LINUX)

pkgs/by-name/de/detect-it-easy/package.nix

+3 −3
Original line number Diff line number Diff line
@@ -13,14 +13,14 @@ 


stdenv.mkDerivation (finalAttrs: {

  pname = "detect-it-easy";

  version = "3.09";

  version = "3.10";



  src = fetchFromGitHub {

    owner = "horsicq";

    repo = "DIE-engine";

    rev = finalAttrs.version;

    fetchSubmodules = true;

    hash = "sha256-A9YZBlGf3j+uSefPiDhrS1Qtu6vaLm4Yodt7BioGD2Q=";

    hash = "sha256-yHgxYig5myY2nExweUk2muKbJTKN3SiwOLgQcMIY/BQ=";

  };



  patches = [ ./0001-remove-hard-coded-paths-in-xoptions.patch ];
@@ -53,7 +53,6 @@ stdenv.mkDerivation (finalAttrs: { 


  # clean up wrongly created dirs in `install.sh` and broken .desktop file

  postInstall = ''

    rm -r $out/lib/{bin,share}

    grep -v "Version=#VERSION#" $src/LINUX/die.desktop > $out/share/applications/die.desktop

  '';
@@ -61,6 +60,7 @@ stdenv.mkDerivation (finalAttrs: { 
    description = "Program for determining types of files for Windows, Linux and MacOS.";

    mainProgram = "die";

    homepage = "https://github.com/horsicq/Detect-It-Easy";

    changelog = "https://github.com/horsicq/Detect-It-Easy/blob/master/changelog.txt";

    maintainers = with lib.maintainers; [ ivyfanchiang ];

    platforms = [ "x86_64-linux" ];

    license = lib.licenses.mit;