about summary refs log tree commit diff
diff options
context:
space:
mode:
authorTuomas Tynkkynen <tuomas@tuxera.com>2016-08-02 21:30:17 +0300
committerTuomas Tynkkynen <tuomas@tuxera.com>2016-08-02 21:30:17 +0300
commit55b23aeff58cd45f6c50905e481af66fed685bf1 (patch)
tree63106b980a61ec64b6072a1c32f3f7166026dd10
parent9b5dcffe22f82f0daebdec6ef7e3dff111a5669f (diff)
downloadnixlib-55b23aeff58cd45f6c50905e481af66fed685bf1.tar
nixlib-55b23aeff58cd45f6c50905e481af66fed685bf1.tar.gz
nixlib-55b23aeff58cd45f6c50905e481af66fed685bf1.tar.bz2
nixlib-55b23aeff58cd45f6c50905e481af66fed685bf1.tar.lz
nixlib-55b23aeff58cd45f6c50905e481af66fed685bf1.tar.xz
nixlib-55b23aeff58cd45f6c50905e481af66fed685bf1.tar.zst
nixlib-55b23aeff58cd45f6c50905e481af66fed685bf1.zip
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.
-rw-r--r--pkgs/build-support/icon-conv-tools/default.nix11
1 files changed, 5 insertions, 6 deletions
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
+}