summary refs log tree commit diff
path: root/pkgs/tools/filesystems/squashfs/default.nix
diff options
context:
space:
mode:
authorDomen Kožar <domen@dev.si>2014-10-22 14:36:56 +0200
committerDomen Kožar <domen@dev.si>2014-10-22 14:36:56 +0200
commitb3a4c3c2d049a6253dffd5050462273c95d2e8e3 (patch)
tree73ea750adda6d6ef87d64ea64f94f69f90455562 /pkgs/tools/filesystems/squashfs/default.nix
parentb31ac058cc19f1ebc2a15b4f6ff4475eb91b0206 (diff)
downloadnixpkgs-b3a4c3c2d049a6253dffd5050462273c95d2e8e3.tar
nixpkgs-b3a4c3c2d049a6253dffd5050462273c95d2e8e3.tar.gz
nixpkgs-b3a4c3c2d049a6253dffd5050462273c95d2e8e3.tar.bz2
nixpkgs-b3a4c3c2d049a6253dffd5050462273c95d2e8e3.tar.lz
nixpkgs-b3a4c3c2d049a6253dffd5050462273c95d2e8e3.tar.xz
nixpkgs-b3a4c3c2d049a6253dffd5050462273c95d2e8e3.tar.zst
nixpkgs-b3a4c3c2d049a6253dffd5050462273c95d2e8e3.zip
squashfs: 4.3 -> 4.4, hopefully fixes http://hydra.nixos.org/build/16422733
Diffstat (limited to 'pkgs/tools/filesystems/squashfs/default.nix')
-rw-r--r--pkgs/tools/filesystems/squashfs/default.nix14
1 files changed, 7 insertions, 7 deletions
diff --git a/pkgs/tools/filesystems/squashfs/default.nix b/pkgs/tools/filesystems/squashfs/default.nix
index facaac8cea7..5e1700af017 100644
--- a/pkgs/tools/filesystems/squashfs/default.nix
+++ b/pkgs/tools/filesystems/squashfs/default.nix
@@ -1,19 +1,18 @@
-{ stdenv, fetchurl, zlib, xz }:
+{ stdenv, fetchgit, zlib, xz }:
 
 stdenv.mkDerivation rec {
-  name = "squashfs-4.3";
+  name = "squashfs-4.4dev";
 
-  src = fetchurl {
-    url = mirror://sourceforge/squashfs/squashfs4.3.tar.gz;
-    sha256 = "1xpklm0y43nd9i6jw43y2xh5zvlmj9ar2rvknh0bh7kv8c95aq0d";
+  src = fetchgit {
+    url = https://github.com/plougher/squashfs-tools.git;
+    sha256 = "059pa2shdysr3zfmwrhq28s12zbi5nyzbpzyaf5lmspgfh1493ks";
+    rev = "9c1db6d13a51a2e009f0027ef336ce03624eac0d";
   };
 
   buildInputs = [ zlib xz ];
 
   preBuild = "cd squashfs-tools";
 
-  NIX_LDFLAGS = "-lgcc_s"; # for pthread_cancel
-
   installFlags = "INSTALL_DIR=\${out}/bin";
 
   makeFlags = "XZ_SUPPORT=1";
@@ -21,5 +20,6 @@ stdenv.mkDerivation rec {
   meta = {
     homepage = http://squashfs.sourceforge.net/;
     description = "Tool for creating and unpacking squashfs filesystems";
+    platforms = stdenv.lib.platforms.linux;
   };
 }