···

       
1
       
 
       
{ stdenv, fetchurl, python, zlib, pkgconfig, glib, ncurses, perl, pixman

     

       
2
       
 
       
, attr, libcap, vde2, alsaLib, texinfo, libuuid, flex, bison, lzo, snappy

     

       
3
       
-
       
, libseccomp, libaio, libcap_ng, gnutls

     

       
4
       
 
       
, makeWrapper

     

       
5
       
 
       
, pulseSupport ? true, libpulseaudio

     

       
6
       
 
       
, sdlSupport ? true, SDL

     
···

       
11
       
 
       


     

       
12
       
 
       
with stdenv.lib;

     

       
13
       
 
       
let

     

       
14
       
-
       
  n = "qemu-2.2.1";

     

       
15
       
 
       
  audio = optionalString (hasSuffix "linux" stdenv.system) "alsa,"

     

       
16
       
 
       
    + optionalString pulseSupport "pa,"

     

       
17
       
 
       
    + optionalString sdlSupport "sdl,";

     
···

       
22
       
 
       


     

       
23
       
 
       
  src = fetchurl {

     

       
24
       
 
       
    url = "http://wiki.qemu.org/download/${n}.tar.bz2";

     

       
25
       
-
       
    sha256 = "181m2ddsg3adw8y5dmimsi8x678imn9f6i5p20zbhi7pdr61a5s6";

     

       
26
       
 
       
  };

     

       
27
       
 
       


     

       
28
       
 
       
  buildInputs =

     

       
29
       
 
       
    [ python zlib pkgconfig glib ncurses perl pixman attr libcap

     

       
30
       
 
       
      vde2 texinfo libuuid flex bison makeWrapper lzo snappy libseccomp

     

       
31
       
-
       
      libcap_ng gnutls

     

       
32
       
 
       
    ]

     

       
33
       
 
       
    ++ optionals pulseSupport [ libpulseaudio ]

     

       
34
       
 
       
    ++ optionals sdlSupport [ SDL ]

     

···

       
1
       
 
       
{ stdenv, fetchurl, python, zlib, pkgconfig, glib, ncurses, perl, pixman

     

       
2
       
 
       
, attr, libcap, vde2, alsaLib, texinfo, libuuid, flex, bison, lzo, snappy

     

       
3
       
+
       
, libseccomp, libaio, libcap_ng, gnutls, nettle

     

       
4
       
 
       
, makeWrapper

     

       
5
       
 
       
, pulseSupport ? true, libpulseaudio

     

       
6
       
 
       
, sdlSupport ? true, SDL

     
···

       
11
       
 
       


     

       
12
       
 
       
with stdenv.lib;

     

       
13
       
 
       
let

     

       
14
       
+
       
  n = "qemu-2.4.0";

     

       
15
       
 
       
  audio = optionalString (hasSuffix "linux" stdenv.system) "alsa,"

     

       
16
       
 
       
    + optionalString pulseSupport "pa,"

     

       
17
       
 
       
    + optionalString sdlSupport "sdl,";

     
···

       
22
       
 
       


     

       
23
       
 
       
  src = fetchurl {

     

       
24
       
 
       
    url = "http://wiki.qemu.org/download/${n}.tar.bz2";

     

       
25
       
+
       
    sha256 = "0836gqv5zcl0xswwjcns3mlkn18lyz2fiq8rl1ihcm6cpf8vkc3j";

     

       
26
       
 
       
  };

     

       
27
       
 
       


     

       
28
       
 
       
  buildInputs =

     

       
29
       
 
       
    [ python zlib pkgconfig glib ncurses perl pixman attr libcap

     

       
30
       
 
       
      vde2 texinfo libuuid flex bison makeWrapper lzo snappy libseccomp

     

       
31
       
+
       
      libcap_ng gnutls nettle

     

       
32
       
 
       
    ]

     

       
33
       
 
       
    ++ optionals pulseSupport [ libpulseaudio ]

     

       
34
       
 
       
    ++ optionals sdlSupport [ SDL ]

     

···

       
1
       
-
       
diff --git a/Makefile b/Makefile

     

       
2
       
-
       
index d6b9dc1..ce7c493 100644

     

       
3
       
 
       
--- a/Makefile

     

       
4
       
 
       
+++ b/Makefile

     

       
5
       
-
       
@@ -384,8 +384,7 @@ install-confdir:

     

       
6
       
-
       
 install-sysconfig: install-datadir install-confdir

     

       
7
       
-
       
 	$(INSTALL_DATA) $(SRC_PATH)/sysconfigs/target/target-x86_64.conf "$(DESTDIR)$(qemu_confdir)"

     

       
8
       
 
       
 

     

       
9
       
-
       
-install: all $(if $(BUILD_DOCS),install-doc) install-sysconfig \

     

       
10
       
 
       
-install-datadir install-localstatedir

     

       
11
       
-
       
+install: all $(if $(BUILD_DOCS),install-doc) install-datadir

     

       
12
       
 
       
 ifneq ($(TOOLS),)

     

       
13
       
 
       
 	$(call install-prog,$(TOOLS),$(DESTDIR)$(bindir))

     

       
14
       
 
       
 endif

     

···

       
0
       
 
       

     

       
0
       
 
       

     

       
1
       
 
       
--- a/Makefile

     

       
2
       
 
       
+++ b/Makefile

     

       
3
       
+
       
@@ -418,7 +418,7 @@

     

       
4
       
+
       
 

     

       
0
       
 
       

     

       
5
       
 
       
 

     

       
6
       
+
       
 install: all $(if $(BUILD_DOCS),install-doc) \

     

       
7
       
 
       
-install-datadir install-localstatedir

     

       
8
       
+
       
+install-datadir

     

       
9
       
 
       
 ifneq ($(TOOLS),)

     

       
10
       
 
       
 	$(call install-prog,$(TOOLS),$(DESTDIR)$(bindir))

     

       
11
       
 
       
 endif