Unverified Commit 72fe11f7 authored by Weijia Wang's avatar Weijia Wang Committed by GitHub
Browse files

Merge pull request #298162 from atorres1985-contrib/xorriso 

Xorriso updates
parents 9f629579 2de37473

pkgs/by-name/li/libisoburn/package.nix

+14 −4
Original line number Diff line number Diff line 
{ lib

, stdenv

, fetchFromGitea

, acl

, attr

, autoreconfHook

, bzip2

, fetchFromGitea

, libburn

, libcdio

, libiconv

, libisofs

, pkg-config

, readline

, stdenv

, zlib

}:
@@ -28,13 +32,19 @@ stdenv.mkDerivation (finalAttrs: { 
  ];



  buildInputs = [

    attr

    bzip2

    libcdio

    libiconv

    readline

    zlib

    libburn

    libisofs

  ] ++ lib.optionals stdenv.isLinux [

    acl

    attr

  ];



  propagatedBuildInputs = [

  propagatedBuildInputs = lib.optionals stdenv.isLinux [

    acl

  ];

pkgs/by-name/xo/xorriso/package.nix

deleted100644 → 0
+0 −59
Original line number Diff line number Diff line 
{ lib

, stdenv

, fetchurl

, acl

, attr

, bzip2

, libcdio

, libiconv

, readline

, zlib

}:



stdenv.mkDerivation (finalAttrs: {

  pname = "xorriso";

  version = "1.5.7-unstable-2023-12-06";



  src = fetchurl {

    url = "https://web.archive.org/web/20231206123448/https://www.gnu.org/software/xorriso/xorriso-1.5.7.tar.gz";

    hash = "sha256-B7lV3n3e1aF7yJsLxwi8C8m3sBmUUePpCV9KfWRuTm0=";

  };



  buildInputs = [

    bzip2

    libcdio

    libiconv

    readline

    zlib

  ]

  ++ lib.optionals stdenv.isLinux [

    acl

    attr

  ];



  outputs = [ "out" "man" ];



  env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin "-include unistd.h";



  doCheck = true;



  strictDeps = true;



  meta = {

    homepage = "https://www.gnu.org/software/xorriso/";

    description = "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 = lib.licenses.gpl3Plus;

    mainProgram = "xorriso";

    maintainers = [ lib.maintainers.AndersonTorres ];

    platforms = lib.platforms.unix;

  };

})

pkgs/top-level/all-packages.nix

+2 −0
Original line number Diff line number Diff line
@@ -14954,6 +14954,8 @@ with pkgs; 
    boost = boost179;

  };













  xorriso = libisoburn;



























  xurls = callPackage ../tools/text/xurls { };





























  xxv = callPackage ../tools/misc/xxv { };