diff options
| author | Frederik Rietdijk <fridh@fridh.nl> | 2018-02-26 10:50:18 +0100 |
|---|---|---|
| committer | Frederik Rietdijk <fridh@fridh.nl> | 2018-02-26 10:50:18 +0100 |
| commit | 4f08b0fbac17c201216abbd776ce3bb292ed4946 (patch) | |
| tree | 129bb0b85b424612237e81d2cf303f7d5c0200fe /pkgs/tools/filesystems/btrfs-progs | |
| parent | 6b381d4c9bed35caee62265a92986cec189243b2 (diff) | |
| parent | 1d6abdd1775d12f7a90414c6e6b4c45ffc612246 (diff) | |
| download | nixpkgs-4f08b0fbac17c201216abbd776ce3bb292ed4946.tar nixpkgs-4f08b0fbac17c201216abbd776ce3bb292ed4946.tar.gz nixpkgs-4f08b0fbac17c201216abbd776ce3bb292ed4946.tar.bz2 nixpkgs-4f08b0fbac17c201216abbd776ce3bb292ed4946.tar.lz nixpkgs-4f08b0fbac17c201216abbd776ce3bb292ed4946.tar.xz nixpkgs-4f08b0fbac17c201216abbd776ce3bb292ed4946.tar.zst nixpkgs-4f08b0fbac17c201216abbd776ce3bb292ed4946.zip | |
Merge remote-tracking branch 'upstream/master' into HEAD
Diffstat (limited to 'pkgs/tools/filesystems/btrfs-progs')
| -rw-r--r-- | pkgs/tools/filesystems/btrfs-progs/default.nix | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/pkgs/tools/filesystems/btrfs-progs/default.nix b/pkgs/tools/filesystems/btrfs-progs/default.nix index 793a540d9bf..09f004f2844 100644 --- a/pkgs/tools/filesystems/btrfs-progs/default.nix +++ b/pkgs/tools/filesystems/btrfs-progs/default.nix @@ -12,12 +12,12 @@ stdenv.mkDerivation rec { sha256 = "15izak6jg6pqr6ha9447cdrdj9k6kfiarvwlrj53cpvrsv02l437"; }; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ - attr acl zlib libuuid e2fsprogs lzo - asciidoc xmlto docbook_xml_dtd_45 docbook_xsl libxslt zstd + nativeBuildInputs = [ + pkgconfig asciidoc xmlto docbook_xml_dtd_45 docbook_xsl libxslt ]; + buildInputs = [ attr acl zlib libuuid e2fsprogs lzo zstd ]; + # gcc bug with -O1 on ARM with gcc 4.8 # This should be fine on all platforms so apply universally patchPhase = "sed -i s/-O1/-O2/ configure"; |