diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2021-07-19 00:01:36 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-07-19 00:01:36 +0000 |
| commit | dc802b2e196f95ce42daa7591e475bba34047331 (patch) | |
| tree | e490c9bceea445e1eff80d7e883b5621e2c29bec /pkgs/misc | |
| parent | e15af378fb53182b63f645c34e4f01cc5879912c (diff) | |
| parent | d5bd34ebf2c2c2b380b76cb86bc68522bc6af4d7 (diff) | |
Merge master into staging-next
Diffstat (limited to 'pkgs/misc')
| -rw-r--r-- | pkgs/misc/apulse/pressureaudio.nix | 3 | ||||
| -rw-r--r-- | pkgs/misc/emulators/fs-uae-launcher/default.nix | 28 |
2 files changed, 29 insertions, 2 deletions
diff --git a/pkgs/misc/apulse/pressureaudio.nix b/pkgs/misc/apulse/pressureaudio.nix index f0b39afb98e89..def25474147b8 100644 --- a/pkgs/misc/apulse/pressureaudio.nix +++ b/pkgs/misc/apulse/pressureaudio.nix @@ -9,8 +9,7 @@ stdenv.mkDerivation { nativeBuildInputs = [ pkg-config intltool autoreconfHook ]; dontConfigure = true; - - buildPhase = ":"; + dontBuild = true; installPhase = '' echo "Copying libraries from apulse." diff --git a/pkgs/misc/emulators/fs-uae-launcher/default.nix b/pkgs/misc/emulators/fs-uae-launcher/default.nix new file mode 100644 index 0000000000000..9416e92e2b022 --- /dev/null +++ b/pkgs/misc/emulators/fs-uae-launcher/default.nix @@ -0,0 +1,28 @@ +{ stdenv, lib, fetchurl, makeWrapper, python3, gettext +, pyqt5, setuptools, requests +}: + +stdenv.mkDerivation rec { + pname = "fs-uae-launcher"; + version = "3.0.5"; + + src = fetchurl { + url = "https://fs-uae.net/stable/${version}/${pname}-${version}.tar.gz"; + sha256 = "1dknra4ngz7bpppwqghmza1q68pn1yaw54p9ba0f42zwp427ly97"; + }; + + makeFlags = [ "prefix=$(out)" ]; + nativeBuildInputs = [ makeWrapper python3 gettext ]; + buildInputs = [ pyqt5 setuptools requests ]; + postInstall = '' + wrapProgram $out/bin/fs-uae-launcher --set PYTHONPATH "$PYTHONPATH" + ''; + + meta = { + description = "Graphical front-end for the FS-UAE emulator"; + license = lib.licenses.gpl2Plus; + homepage = "https://fs-uae.net"; + maintainers = with lib; [ maintainers.sander ]; + platforms = [ "i686-linux" "x86_64-linux" ]; + }; +} |