From 55b23aeff58cd45f6c50905e481af66fed685bf1 Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas@tuxera.com>
Date: Tue, 2 Aug 2016 21:30:17 +0300
Subject: icon-conv-tools: Don't depend on the .nix file at build time

The `src = ./.;` would cause spurious rebuild of the package since the
output hash now depends on the contents of the .nix file.
---
 pkgs/build-support/icon-conv-tools/default.nix | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

(limited to 'pkgs/build-support')

diff --git a/pkgs/build-support/icon-conv-tools/default.nix b/pkgs/build-support/icon-conv-tools/default.nix
index 739ec485159b..50c3f5feb0b5 100644
--- a/pkgs/build-support/icon-conv-tools/default.nix
+++ b/pkgs/build-support/icon-conv-tools/default.nix
@@ -3,23 +3,23 @@
 stdenv.mkDerivation {
   name = "icon-conv-tools-0.0.0";
 
-  src = ./.;
+  src = ./bin;
 
   buildInputs = [ icoutils ];
 
   patchPhase = ''
-    substituteInPlace "./bin/extractWinRscIconsToStdFreeDesktopDir.sh" \
+    substituteInPlace extractWinRscIconsToStdFreeDesktopDir.sh \
       --replace "icotool" "${icoutils}/bin/icotool" \
       --replace "wrestool" "${icoutils}/bin/wrestool"
   '';
 
   buildPhase = ''
     mkdir -p "$out/bin"
-    cp -p "./bin/"* "$out/bin"
+    cp -p * "$out/bin"
   '';
 
   installPhase = "true";
-  
+
   dontPatchELF = true;
   dontStrip = true;
 
@@ -27,5 +27,4 @@ stdenv.mkDerivation {
     description = "Tools for icon conversion specific to nix package manager";
     maintainers = with stdenv.lib.maintainers; [ jraygauthier ];
   };
-
-}
\ No newline at end of file
+}
-- 
cgit 1.4.1