diff options
| -rw-r--r-- | pkgs/tools/cd-dvd/mkisofs/default.nix | 25 | ||||
| -rw-r--r-- | pkgs/tools/cd-dvd/xorriso/default.nix | 36 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 4 |
3 files changed, 38 insertions, 27 deletions
diff --git a/pkgs/tools/cd-dvd/mkisofs/default.nix b/pkgs/tools/cd-dvd/mkisofs/default.nix deleted file mode 100644 index 255e7467def..00000000000 --- a/pkgs/tools/cd-dvd/mkisofs/default.nix +++ /dev/null @@ -1,25 +0,0 @@ -{ fetchurl, stdenv, gettext }: - -stdenv.mkDerivation rec { - name = "mkisofs-1.13"; - - src = fetchurl { - url = "mirror://gnu/isofsmk/${name}.tar.gz"; - sha256 = "13f8zynl64aaqjgxf0m1m2gbizdh7ndicg5d1bm6s0x97bqifrfn"; - }; - - buildInputs = [ gettext ]; - - doCheck = true; - - meta = { - homepage = http://savannah.gnu.org/projects/isofsmk; - - description = "GNU mkisofs, an ISO 9660 filesystem builder"; - - license = "GPLv3+"; - - maintainers = [ stdenv.lib.maintainers.ludo ]; - platforms = stdenv.lib.platforms.all; - }; -} diff --git a/pkgs/tools/cd-dvd/xorriso/default.nix b/pkgs/tools/cd-dvd/xorriso/default.nix new file mode 100644 index 00000000000..236b81b673f --- /dev/null +++ b/pkgs/tools/cd-dvd/xorriso/default.nix @@ -0,0 +1,36 @@ +{ fetchurl, stdenv, libcdio, zlib, bzip2, readline, acl }: + +stdenv.mkDerivation rec { + name = "xorriso-1.0.0"; + + src = fetchurl { + url = "mirror://gnu/xorriso/${name}.tar.gz"; + sha256 = "0kswdvncyhc4zsmydpv0k8pkjg4b5bswvsq2lnl0m7jlf8n0iwlz"; + }; + + doCheck = true; + + buildInputs = [ libcdio zlib bzip2 readline ] + ++ stdenv.lib.optional stdenv.isLinux acl; + + meta = { + description = "GNU xorriso, an ISO 9660 Rock Ridge file system manipulator"; + + longDescription = + '' GNU xorriso copies file objects from POSIX compliant filesystems + into Rock Ridge enhanced ISO 9660 filesystems and allows + session-wise manipulation of such filesystems. It can load the + management information of existing ISO images and it writes the + session results to optical media or to filesystem objects. Vice + versa xorriso is able to copy file objects out of ISO 9660 + filesystems. + ''; + + license = "GPLv3+"; + + homepage = http://www.gnu.org/software/xorriso/; + + maintainers = [ stdenv.lib.maintainers.ludo ]; + platforms = stdenv.lib.platforms.unix; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7f7e378b2a9..67fda049989 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -884,8 +884,6 @@ let mjpegtools = callPackage ../tools/video/mjpegtools { }; - mkisofs = callPackage ../tools/cd-dvd/mkisofs { }; - mktemp = callPackage ../tools/security/mktemp { }; mldonkey = callPackage ../applications/networking/p2p/mldonkey { }; @@ -1469,6 +1467,8 @@ let inherit python setuptools; }; + xorriso = callPackage ../tools/cd-dvd/xorriso { }; + xpf = callPackage ../tools/text/xml/xpf { libxml2 = libxml2Python; }; |