Merge commit '2d2f10475138b7206572dc3ec288184df2be022e'

1 files changed, 10 insertions, 16 deletions

diff --git a/nixpkgs/pkgs/applications/misc/qdirstat/default.nix b/nixpkgs/pkgs/applications/misc/qdirstat/default.nix
index cbbac11424ec..abf4bb054621 100644
--- a/nixpkgs/pkgs/applications/misc/qdirstat/default.nix
+++ b/nixpkgs/pkgs/applications/misc/qdirstat/default.nix
@@ -1,9 +1,9 @@
 { stdenv, fetchFromGitHub, qmake
 , coreutils, xdg_utils, bash
-, perl, makeWrapper, perlPackages }:
+, makeWrapper, perlPackages }:
 
 let
-  version = "1.4";
+  version = "1.5";
 in stdenv.mkDerivation rec {
   name = "qdirstat-${version}";
 
@@ -11,27 +11,18 @@ in stdenv.mkDerivation rec {
     owner = "shundhammer";
     repo = "qdirstat";
     rev = "${version}";
-    sha256 = "1ppasbr0mq301q6n3rm0bsmprs7vgkcjmmc0gbgqpgw84nmp9fqh";
+    sha256 = "1v879kd7zahalb2qazq61wzi364k5cy3lgy6c8wj6mclwxjws1vc";
   };
 
   nativeBuildInputs = [ qmake makeWrapper ];
 
-  buildInputs = [ perl ];
+  buildInputs = [ perlPackages.perl ];
 
   preBuild = ''
     substituteInPlace scripts/scripts.pro \
-      --replace /bin/true ${coreutils}/bin/true \
-      --replace /usr/bin $out/bin
-    substituteInPlace src/src.pro \
-      --replace /usr/bin $out/bin \
-      --replace /usr/share $out/share
-    for i in doc/doc.pro doc/stats/stats.pro
-    do
-      substituteInPlace $i \
-        --replace /usr/share $out/share
-    done
+      --replace /bin/true ${coreutils}/bin/true
 
-    for i in src/MainWindow.cpp src/FileSizeStatsWindow.cpp
+    for i in src/SysUtil.cpp src/FileSizeStatsWindow.cpp
     do
       substituteInPlace $i \
         --replace /usr/bin/xdg-open ${xdg_utils}/bin/xdg-open
@@ -45,10 +36,13 @@ in stdenv.mkDerivation rec {
     substituteInPlace src/StdCleanup.cpp \
       --replace /bin/bash ${bash}/bin/bash
   '';
+  postPatch = ''
+    export qmakeFlags="$qmakeFlags INSTALL_PREFIX=$out"
+  '';
 
   postInstall = ''
     wrapProgram $out/bin/qdirstat-cache-writer \
-      --set PERL5LIB "${stdenv.lib.makePerlPath [ perlPackages.URI ]}"
+      --set PERL5LIB "${perlPackages.makePerlPath [ perlPackages.URI ]}"
   '';
 
   meta = with stdenv.lib; {