Unverified Commit a7e62e65 authored by lassulus's avatar lassulus Committed by GitHub
Browse files

cdemu-daemon: 3.2.6 -> 3.2.7 (#342883)

parents f0297c4e 801b8a21

nixos/modules/programs/cdemu.nix

+1 −1
Original line number Diff line number Diff line
@@ -60,7 +60,7 @@ in { 
    systemd.user.services.cdemu-daemon.serviceConfig = {

      Type = "dbus";

      BusName = "net.sf.cdemu.CDEmuDaemon";

      ExecStart = "${pkgs.cdemu-daemon}/bin/cdemu-daemon --config-file \"%h/.config/cdemu-daemon\"";

      ExecStart = "${lib.getExe pkgs.cdemu-daemon} --config-file \"%h/.config/cdemu-daemon\"";

      Restart = "no";

    };

pkgs/applications/emulators/cdemu/daemon.nix

+18 −3
Original line number Diff line number Diff line 
{ stdenv, callPackage, cmake, pkg-config, glib, libao, intltool, libmirage, coreutils }:

stdenv.mkDerivation {



let

  inherit (callPackage ./common-drv-attrs.nix {

    version = "3.2.6";

    version = "3.2.7";

    pname = "cdemu-daemon";

    hash = "sha256-puQE4+91xhRuNjVPZYgN/WO0uO8fVAOdxQWOGQ+FfY8=";

    hash = "sha256-EKh2G6RA9Yq46BpTAqN2s6TpLJb8gwDuEpGiwdGcelc=";

  }) pname version src meta;

in

stdenv.mkDerivation {

  inherit pname version src;



  nativeBuildInputs = [ cmake pkg-config intltool ];

  buildInputs = [ glib libao libmirage ];
@@ -17,4 +20,16 @@ stdenv.mkDerivation { 
      $out/share/dbus-1/services/net.sf.cdemu.CDEmuDaemon.service \

      --replace /bin/true ${coreutils}/bin/true

  '';



  meta = {

    inherit (meta)

      description

      license

      longDescription

      maintainers

      platforms

      ;

    homepage = "https://cdemu.sourceforge.io/about/daemon/";

    mainProgram = "cdemu-daemon";

  };

}

pkgs/applications/emulators/cdemu/libmirage.nix

+15 −4
Original line number Diff line number Diff line
@@ -2,13 +2,15 @@ 
, glib, libsndfile, zlib, bzip2, xz, libsamplerate, intltool

, pcre, util-linux, libselinux, libsepol }:



stdenv.mkDerivation {



let

  inherit (callPackage ./common-drv-attrs.nix {

    version = "3.2.7";

    version = "3.2.9";

    pname = "libmirage";

    hash = "sha256-+okkgNeVS8yoKSrQDy4It7PiPlTSiOsUoFxQ1FS9s9M=";

    hash = "sha256-JBd+wHSZRyRW1SZsaAaRO2dNUFkpwRCr3s1f39KyWIs=";

  }) pname version src meta;

in

stdenv.mkDerivation {

  inherit pname version src;



  PKG_CONFIG_GOBJECT_INTROSPECTION_1_0_GIRDIR = "${placeholder "out"}/share/gir-1.0";

  PKG_CONFIG_GOBJECT_INTROSPECTION_1_0_TYPELIBDIR = "${placeholder "out"}/lib/girepository-1.0";
@@ -16,4 +18,13 @@ stdenv.mkDerivation { 
  nativeBuildInputs = [ cmake pkg-config intltool gobject-introspection ];

  propagatedBuildInputs = [ pcre util-linux libselinux libsepol ];



  meta = {

    inherit (meta)

      maintainers

      license

      platforms

      ;

    description = "CD-ROM image access library";

    homepage = "https://cdemu.sourceforge.io/about/libmirage/";

  };

}

pkgs/applications/emulators/cdemu/vhba.nix

+2 −2
Original line number Diff line number Diff line
@@ -2,11 +2,11 @@ 


stdenv.mkDerivation rec {

  pname = "vhba";

  version = "20240202";

  version = "20240917";



  src  = fetchurl {

    url = "mirror://sourceforge/cdemu/vhba-module-${version}.tar.xz";

    hash = "sha256-v1hQ1Lj1AiHKh9c0OpKe2oexkfb1roxhQXRUO1ut3oM=";

    hash = "sha256-zjTLriw2zvjX0Jxfa9QtaHG5tTC7cLTKEA+WSCP+Dpg=";

  };



  makeFlags = kernel.makeFlags ++ [ "KDIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" "INSTALL_MOD_PATH=$(out)" ];