public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into staging

Browse Source 
* master: (48 commits)
  Mathematica: 11.0.1 -> 11.2.0
  kbfs: 20170922.f76290 -> 20171004.40555d
  packer: 1.0.3 -> 1.1.0
  libxdg-basedir: 1.0.2 -> 1.2.0
  fscrypt: 0.2.1 -> 0.2.2
  devtodo: init at 0.1.20
  keybase: 1.0.30 -> 1.0.33
  elixir: Fix locale problem on NixOS
  keybase-gui: 1.0.25 -> 1.0.33
  terraform: 0.10.2 -> 0.10.7  (#30055)
  emby: 3.2.32.0 -> 3.2.33.0
  sbcl: 1.3.21 -> 1.4.0
  ardour: 5.11 -> 5.12
  axoloti: fix evaluation
  axoloti: init at 1.0.12-1
  melpa-packages: Add new lean packages
  fastlane: init at 2.60.1
  nixos/traefik: guard example path
  go-ethereum: 1.7.0 -> 1.7.1
  xzgv: 0.9.1 -> 0.9.2
  ...
This commit is contained in:
Orivej Desh
2017-10-05 07:41:39 +00:00
parent 514593ea31 b14db2cddf
commit 66d4941afe
55 changed files with 1501 additions and 295 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/tools/cd-dvd/xorriso/default.nix
+3 -3
View File
@@ -1,4 +1,4 @@
{ fetchurl, stdenv, libcdio, zlib, bzip2, readline, acl, attr }:
{ fetchurl, stdenv, libcdio, zlib, bzip2, readline, acl, attr, libiconv }:
stdenv.mkDerivation rec {
name = "xorriso-1.4.8";
@@ -10,8 +10,8 @@ stdenv.mkDerivation rec {
doCheck = true;
buildInputs = [ libcdio zlib bzip2 readline attr ]
++ stdenv.lib.optional stdenv.isLinux acl;
buildInputs = [ libcdio zlib bzip2 readline libiconv ]
++ stdenv.lib.optionals stdenv.isLinux [ acl attr ];
meta = with stdenv.lib; {
description = "ISO 9660 Rock Ridge file system manipulator";