diff options
| author | Robin Gloster <mail@glob.in> | 2016-05-02 22:58:02 +0000 |
|---|---|---|
| committer | Robin Gloster <mail@glob.in> | 2016-05-02 22:58:02 +0000 |
| commit | c92bca56f8ea5623cf01952621455db308d0f330 (patch) | |
| tree | f940e6e4fabd8e58b91fe885f9541205258023b2 /pkgs/misc/emulators | |
| parent | 0fdde5efd08c036fe9d73b4e65f2ba9797053d0f (diff) | |
| parent | 94520a25adc6b6bee799ec9dab344cfdad3f7180 (diff) | |
| download | nixlib-c92bca56f8ea5623cf01952621455db308d0f330.tar nixlib-c92bca56f8ea5623cf01952621455db308d0f330.tar.gz nixlib-c92bca56f8ea5623cf01952621455db308d0f330.tar.bz2 nixlib-c92bca56f8ea5623cf01952621455db308d0f330.tar.lz nixlib-c92bca56f8ea5623cf01952621455db308d0f330.tar.xz nixlib-c92bca56f8ea5623cf01952621455db308d0f330.tar.zst nixlib-c92bca56f8ea5623cf01952621455db308d0f330.zip | |
Merge remote-tracking branch 'upstream/master' into hardened-stdenv
Diffstat (limited to 'pkgs/misc/emulators')
| -rw-r--r-- | pkgs/misc/emulators/dosbox/default.nix | 6 | ||||
| -rw-r--r-- | pkgs/misc/emulators/ppsspp/default.nix | 6 | ||||
| -rw-r--r-- | pkgs/misc/emulators/wine/base.nix | 2 |
3 files changed, 7 insertions, 7 deletions
diff --git a/pkgs/misc/emulators/dosbox/default.nix b/pkgs/misc/emulators/dosbox/default.nix index d57ef5ae16da..53588cfd70b3 100644 --- a/pkgs/misc/emulators/dosbox/default.nix +++ b/pkgs/misc/emulators/dosbox/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, SDL, makeDesktopItem }: +{ stdenv, fetchurl, SDL, makeDesktopItem, mesa }: stdenv.mkDerivation rec { name = "dosbox-0.74"; @@ -18,10 +18,10 @@ stdenv.mkDerivation rec { patchFlags = "-p0"; - buildInputs = [ SDL ]; - hardeningDisable = [ "format" ]; + buildInputs = [ SDL mesa ]; + desktopItem = makeDesktopItem { name = "dosbox"; exec = "dosbox"; diff --git a/pkgs/misc/emulators/ppsspp/default.nix b/pkgs/misc/emulators/ppsspp/default.nix index 439566de0cad..87ae977c7cc7 100644 --- a/pkgs/misc/emulators/ppsspp/default.nix +++ b/pkgs/misc/emulators/ppsspp/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit, zlib, libpng, qt4, pkgconfig +{ stdenv, fetchgit, zlib, libpng, qt4, qmake4Hook, pkgconfig , withGamepads ? true, SDL # SDL is used for gamepad functionality }: @@ -19,10 +19,10 @@ stdenv.mkDerivation rec{ sha256 = "71dfa0be045f31969b1d6ab4f1adf6a208f9ef4834d708bc7bf6d9195efb5f80"; }; - buildInputs = [ zlib libpng pkgconfig qt4 ] + buildInputs = [ zlib libpng pkgconfig qt4 qmake4Hook ] ++ (if withGamepads then [ SDL ] else [ ]); - configurePhase = "cd Qt && qmake PPSSPPQt.pro"; + preConfigure = "cd Qt"; installPhase = "mkdir -p $out/bin && cp ppsspp $out/bin"; meta = { diff --git a/pkgs/misc/emulators/wine/base.nix b/pkgs/misc/emulators/wine/base.nix index 804eb0bb304c..60fb8e11391b 100644 --- a/pkgs/misc/emulators/wine/base.nix +++ b/pkgs/misc/emulators/wine/base.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation ((lib.optionalAttrs (! isNull buildScript) { NIX_LDFLAGS = map (path: "-rpath " + path) ( map (x: "${x}/lib") ([ stdenv.cc.cc ] ++ (map (x: x.lib or x.out) buildInputs)) # libpulsecommon.so is linked but not found otherwise - ++ lib.optionals pulseaudioSupport (map (x: "${x}/lib/pulseaudio") (toBuildInputs pkgArches (pkgs: [ pkgs.libpulseaudio ]))) + ++ lib.optionals pulseaudioSupport (map (x: "${x.lib or x.out}/lib/pulseaudio") (toBuildInputs pkgArches (pkgs: [ pkgs.libpulseaudio ]))) ); # Don't shrink the ELF RPATHs in order to keep the extra RPATH |