diff options
Diffstat (limited to 'pkgs/applications/emulators/cdemu')
-rw-r--r-- | pkgs/applications/emulators/cdemu/analyzer.nix | 39 | ||||
-rw-r--r-- | pkgs/applications/emulators/cdemu/client.nix | 33 | ||||
-rw-r--r-- | pkgs/applications/emulators/cdemu/common-drv-attrs.nix (renamed from pkgs/applications/emulators/cdemu/base.nix) | 25 | ||||
-rw-r--r-- | pkgs/applications/emulators/cdemu/daemon.nix | 22 | ||||
-rw-r--r-- | pkgs/applications/emulators/cdemu/gui.nix | 39 | ||||
-rw-r--r-- | pkgs/applications/emulators/cdemu/libmirage.nix | 27 | ||||
-rw-r--r-- | pkgs/applications/emulators/cdemu/vhba.nix | 2 |
7 files changed, 93 insertions, 94 deletions
diff --git a/pkgs/applications/emulators/cdemu/analyzer.nix b/pkgs/applications/emulators/cdemu/analyzer.nix index 5b111b80285a9..244abc4f96c78 100644 --- a/pkgs/applications/emulators/cdemu/analyzer.nix +++ b/pkgs/applications/emulators/cdemu/analyzer.nix @@ -1,20 +1,21 @@ -{ callPackage, makeWrapper, gobject-introspection, cmake -, python3Packages, gtk3, glib, libxml2, gnuplot, gnome, gdk-pixbuf, librsvg, intltool, libmirage }: -let pkg = import ./base.nix { - version = "3.2.5"; - pname = "image-analyzer"; - pkgSha256 = "00906lky0z1m0bdqnjmzxgcb19dzvljhddhh42lixyr53sjp94cc"; -}; -in callPackage pkg { - buildInputs = [ glib gtk3 libxml2 gnuplot libmirage gnome.adwaita-icon-theme gdk-pixbuf librsvg - python3Packages.python python3Packages.pygobject3 python3Packages.matplotlib ]; - drvParams = { - nativeBuildInputs = [ gobject-introspection cmake makeWrapper intltool ]; - postFixup = '' - wrapProgram $out/bin/image-analyzer \ - --set PYTHONPATH "$PYTHONPATH" \ - --set GI_TYPELIB_PATH "$GI_TYPELIB_PATH" \ - --prefix XDG_DATA_DIRS : "$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" - ''; - }; +{ cmake, pkg-config, callPackage, gobject-introspection, wrapGAppsHook3 +, python3Packages, libxml2, gnuplot, gnome, gdk-pixbuf, intltool, libmirage }: +python3Packages.buildPythonApplication { + + inherit (callPackage ./common-drv-attrs.nix { + version = "3.2.6"; + pname = "image-analyzer"; + hash = "sha256-7I8RUgd+k3cEzskJGbziv1f0/eo5QQXn62wGh/Y5ozc="; + }) pname version src meta; + + buildInputs = [ libxml2 gnuplot libmirage gnome.adwaita-icon-theme gdk-pixbuf ]; + propagatedBuildInputs = with python3Packages; [ pygobject3 matplotlib ]; + nativeBuildInputs = [ cmake pkg-config wrapGAppsHook3 intltool gobject-introspection ]; + + pyproject = false; + dontWrapGApps = true; + preFixup = '' + makeWrapperArgs+=("''${gappsWrapperArgs[@]}") + ''; + } diff --git a/pkgs/applications/emulators/cdemu/client.nix b/pkgs/applications/emulators/cdemu/client.nix index 2e301a115c9a2..0a9c71cf6e14c 100644 --- a/pkgs/applications/emulators/cdemu/client.nix +++ b/pkgs/applications/emulators/cdemu/client.nix @@ -1,16 +1,19 @@ -{ callPackage, python3Packages, intltool, makeWrapper }: -let pkg = import ./base.nix { - version = "3.2.5"; - pname = "cdemu-client"; - pkgSha256 = "1prrdhv0ia0axc6b73crszqzh802wlkihz6d100yvg7wbgmqabd7"; -}; -in callPackage pkg { - nativeBuildInputs = [ makeWrapper intltool ]; - buildInputs = [ python3Packages.python python3Packages.dbus-python python3Packages.pygobject3 ]; - drvParams = { - postFixup = '' - wrapProgram $out/bin/cdemu \ - --set PYTHONPATH "$PYTHONPATH" - ''; - }; +{ callPackage, python3Packages, cmake, pkg-config, intltool, wrapGAppsNoGuiHook, gobject-introspection }: +python3Packages.buildPythonApplication { + + inherit (callPackage ./common-drv-attrs.nix { + version = "3.2.5"; + pname = "cdemu-client"; + hash = "sha256-py2F61v8vO0BCM18GCflAiD48deZjbMM6wqoCDZsOd8="; + }) pname version src meta; + + nativeBuildInputs = [ cmake pkg-config intltool wrapGAppsNoGuiHook gobject-introspection ]; + propagatedBuildInputs = with python3Packages; [ dbus-python pygobject3 ]; + + pyproject = false; + dontWrapGApps = true; + preFixup = '' + makeWrapperArgs+=("''${gappsWrapperArgs[@]}") + ''; + } diff --git a/pkgs/applications/emulators/cdemu/base.nix b/pkgs/applications/emulators/cdemu/common-drv-attrs.nix index 994a0f0e03daf..2a99841eeed81 100644 --- a/pkgs/applications/emulators/cdemu/base.nix +++ b/pkgs/applications/emulators/cdemu/common-drv-attrs.nix @@ -1,22 +1,15 @@ -{ pname, version, pkgSha256 }: -attrs@{ lib, stdenv, fetchurl, cmake, pkg-config, buildInputs, drvParams ? {}, ... }: -stdenv.mkDerivation ( rec { - inherit pname version buildInputs; +{ lib, fetchurl +, pname, version, hash +}: + +{ + inherit pname version; src = fetchurl { url = "mirror://sourceforge/cdemu/${pname}-${version}.tar.xz"; - sha256 = pkgSha256; + inherit hash; }; - nativeBuildInputs = (attrs.nativeBuildInputs or [ ]) ++ [ pkg-config cmake ]; - setSourceRoot = '' - mkdir build - cd build - sourceRoot="`pwd`" - ''; - configurePhase = '' - cmake ../${pname}-${version} -DCMAKE_INSTALL_PREFIX=$out -DCMAKE_BUILD_TYPE=Release -DCMAKE_SKIP_RPATH=ON - ''; meta = with lib; { - description = "A suite of tools for emulating optical drives and discs"; + description = "Suite of tools for emulating optical drives and discs"; longDescription = '' CDEmu consists of: @@ -33,4 +26,4 @@ stdenv.mkDerivation ( rec { platforms = platforms.linux; maintainers = with lib.maintainers; [ bendlas ]; }; -} // drvParams) +} diff --git a/pkgs/applications/emulators/cdemu/daemon.nix b/pkgs/applications/emulators/cdemu/daemon.nix index 359b2f26a5735..5382efbff2376 100644 --- a/pkgs/applications/emulators/cdemu/daemon.nix +++ b/pkgs/applications/emulators/cdemu/daemon.nix @@ -1,15 +1,17 @@ -{ callPackage, glib, libao, intltool, libmirage, coreutils }: -let pkg = import ./base.nix { - version = "3.2.5"; - pname = "cdemu-daemon"; - pkgSha256 = "16g6fv1lxkdmbsy6zh5sj54dvgwvm900fd18aq609yg8jnqm644d"; -}; -in callPackage pkg { - nativeBuildInputs = [ intltool ]; +{ stdenv, callPackage, cmake, pkg-config, glib, libao, intltool, libmirage, coreutils }: +stdenv.mkDerivation { + + inherit (callPackage ./common-drv-attrs.nix { + version = "3.2.6"; + pname = "cdemu-daemon"; + hash = "sha256-puQE4+91xhRuNjVPZYgN/WO0uO8fVAOdxQWOGQ+FfY8="; + }) pname version src meta; + + nativeBuildInputs = [ cmake pkg-config intltool ]; buildInputs = [ glib libao libmirage ]; - drvParams.postInstall = '' + postInstall = '' mkdir -p $out/share/dbus-1/services - cp -R ../$pname-$version/service-example $out/share/cdemu + cp -R ../service-example $out/share/cdemu substitute \ $out/share/cdemu/net.sf.cdemu.CDEmuDaemon.service \ $out/share/dbus-1/services/net.sf.cdemu.CDEmuDaemon.service \ diff --git a/pkgs/applications/emulators/cdemu/gui.nix b/pkgs/applications/emulators/cdemu/gui.nix index 3083e1960b5dd..ff2ebd68ca4d1 100644 --- a/pkgs/applications/emulators/cdemu/gui.nix +++ b/pkgs/applications/emulators/cdemu/gui.nix @@ -1,22 +1,21 @@ -{ callPackage, makeWrapper, gobject-introspection, cmake -, python3Packages, gtk3, glib, libnotify, intltool, gnome, gdk-pixbuf, librsvg }: -let - pkg = import ./base.nix { - version = "3.2.5"; +{ callPackage, cmake, pkg-config, wrapGAppsHook3, gobject-introspection +, python3Packages, libnotify, intltool, gnome, gdk-pixbuf }: +python3Packages.buildPythonApplication { + + inherit (callPackage ./common-drv-attrs.nix { + version = "3.2.6"; pname = "gcdemu"; - pkgSha256 = "1nvpbq4mz8caw91q5ny9gf206g9bypavxws9nxyfcanfkc4zfkl4"; - }; - inherit (python3Packages) python pygobject3; -in callPackage pkg { - buildInputs = [ python pygobject3 gtk3 glib libnotify gnome.adwaita-icon-theme gdk-pixbuf librsvg ]; - drvParams = { - nativeBuildInputs = [ gobject-introspection cmake makeWrapper intltool ]; - postFixup = '' - wrapProgram $out/bin/gcdemu \ - --set PYTHONPATH "$PYTHONPATH" \ - --set GI_TYPELIB_PATH "$GI_TYPELIB_PATH" \ - --prefix XDG_DATA_DIRS : "$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" - ''; - # TODO AppIndicator - }; + hash = "sha256-w4vzKoSotL5Cjfr4Cu4YhNSWXJqS+n/vySrwvbhR1zA="; + }) pname version src meta; + + nativeBuildInputs = [ cmake pkg-config wrapGAppsHook3 intltool gobject-introspection ]; + buildInputs = [ libnotify gnome.adwaita-icon-theme gdk-pixbuf ]; + propagatedBuildInputs = with python3Packages; [ pygobject3 ]; + + pyproject = false; + dontWrapGApps = true; + preFixup = '' + makeWrapperArgs+=("''${gappsWrapperArgs[@]}") + ''; + } diff --git a/pkgs/applications/emulators/cdemu/libmirage.nix b/pkgs/applications/emulators/cdemu/libmirage.nix index b631d3669dc9d..bbc013be18a0d 100644 --- a/pkgs/applications/emulators/cdemu/libmirage.nix +++ b/pkgs/applications/emulators/cdemu/libmirage.nix @@ -1,18 +1,19 @@ -{ callPackage, gobject-introspection, cmake, pkg-config +{ stdenv, callPackage, cmake, pkg-config, gobject-introspection , glib, libsndfile, zlib, bzip2, xz, libsamplerate, intltool , pcre, util-linux, libselinux, libsepol }: -let pkg = import ./base.nix { - version = "3.2.5"; - pname = "libmirage"; - pkgSha256 = "0f8i2ha44rykkk3ac2q8zsw3y1zckw6qnf6zvkyrj3qqbzhrf3fm"; -}; -in callPackage pkg { +stdenv.mkDerivation { + + inherit (callPackage ./common-drv-attrs.nix { + version = "3.2.7"; + pname = "libmirage"; + hash = "sha256-+okkgNeVS8yoKSrQDy4It7PiPlTSiOsUoFxQ1FS9s9M="; + }) pname version src meta; + + 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"; buildInputs = [ glib libsndfile zlib bzip2 xz libsamplerate ]; - drvParams = { - 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"; - nativeBuildInputs = [ cmake gobject-introspection pkg-config intltool ]; - propagatedBuildInputs = [ pcre util-linux libselinux libsepol ]; - }; + nativeBuildInputs = [ cmake pkg-config intltool gobject-introspection ]; + propagatedBuildInputs = [ pcre util-linux libselinux libsepol ]; + } diff --git a/pkgs/applications/emulators/cdemu/vhba.nix b/pkgs/applications/emulators/cdemu/vhba.nix index 103e4b4b5b89e..15b69500f3d20 100644 --- a/pkgs/applications/emulators/cdemu/vhba.nix +++ b/pkgs/applications/emulators/cdemu/vhba.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://sourceforge/cdemu/vhba-module-${version}.tar.xz"; - sha256 = "sha256-v1hQ1Lj1AiHKh9c0OpKe2oexkfb1roxhQXRUO1ut3oM="; + hash = "sha256-v1hQ1Lj1AiHKh9c0OpKe2oexkfb1roxhQXRUO1ut3oM="; }; makeFlags = kernel.makeFlags ++ [ "KDIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" "INSTALL_MOD_PATH=$(out)" ]; |