diff options
| author | Orivej Desh <orivej@gmx.fr> | 2017-10-05 07:41:39 +0000 |
|---|---|---|
| committer | Orivej Desh <orivej@gmx.fr> | 2017-10-05 07:41:39 +0000 |
| commit | 66d4941afe2edc8e5287a70089c25464490114f0 (patch) | |
| tree | b1bbd01ad887ae401be7ddc5295431d11d2a95d0 /pkgs/tools/cd-dvd | |
| parent | 514593ea31d7e67e8efa2f2ff26c9569d508a5ef (diff) | |
| parent | b14db2cddfb054c0ff46523fa95ba56153b230e0 (diff) | |
| download | nixpkgs-66d4941afe2edc8e5287a70089c25464490114f0.tar nixpkgs-66d4941afe2edc8e5287a70089c25464490114f0.tar.gz nixpkgs-66d4941afe2edc8e5287a70089c25464490114f0.tar.bz2 nixpkgs-66d4941afe2edc8e5287a70089c25464490114f0.tar.lz nixpkgs-66d4941afe2edc8e5287a70089c25464490114f0.tar.xz nixpkgs-66d4941afe2edc8e5287a70089c25464490114f0.tar.zst nixpkgs-66d4941afe2edc8e5287a70089c25464490114f0.zip | |
Merge branch 'master' into staging
* 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 ...
Diffstat (limited to 'pkgs/tools/cd-dvd')
| -rw-r--r-- | pkgs/tools/cd-dvd/xorriso/default.nix | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/tools/cd-dvd/xorriso/default.nix b/pkgs/tools/cd-dvd/xorriso/default.nix index b91a59006e9..8f2577c4344 100644 --- a/pkgs/tools/cd-dvd/xorriso/default.nix +++ b/pkgs/tools/cd-dvd/xorriso/default.nix @@ -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"; |