diff options
| author | Sander van der Burg <svanderburg@gmail.com> | 2017-09-10 13:37:26 +0000 |
|---|---|---|
| committer | Sander van der Burg <svanderburg@gmail.com> | 2017-09-10 13:37:26 +0000 |
| commit | 6e1eedd64e6ba3e9b84db038e6f20bb9a2e17177 (patch) | |
| tree | 18a586cfe04d81778d7c842d13821a96fe102418 /pkgs/misc | |
| parent | 7641d0e335662952b1d95dbe3c6613a94348e0ea (diff) | |
| download | nixlib-6e1eedd64e6ba3e9b84db038e6f20bb9a2e17177.tar nixlib-6e1eedd64e6ba3e9b84db038e6f20bb9a2e17177.tar.gz nixlib-6e1eedd64e6ba3e9b84db038e6f20bb9a2e17177.tar.bz2 nixlib-6e1eedd64e6ba3e9b84db038e6f20bb9a2e17177.tar.lz nixlib-6e1eedd64e6ba3e9b84db038e6f20bb9a2e17177.tar.xz nixlib-6e1eedd64e6ba3e9b84db038e6f20bb9a2e17177.tar.zst nixlib-6e1eedd64e6ba3e9b84db038e6f20bb9a2e17177.zip | |
vice: 2.2 -> 3.1 + fix build procedure
Diffstat (limited to 'pkgs/misc')
| -rw-r--r-- | pkgs/misc/emulators/vice/default.nix | 24 |
1 files changed, 16 insertions, 8 deletions
diff --git a/pkgs/misc/emulators/vice/default.nix b/pkgs/misc/emulators/vice/default.nix index 6251282aae32..0b56cb21dc0d 100644 --- a/pkgs/misc/emulators/vice/default.nix +++ b/pkgs/misc/emulators/vice/default.nix @@ -1,18 +1,19 @@ -{ stdenv, fetchurl, perl, libpng, giflib, libjpeg, alsaLib, readline, mesa, libX11 +{ stdenv, fetchurl, bison, flex, perl, libpng, giflib, libjpeg, alsaLib, readline, mesa, libX11, libXaw , pkgconfig, gtk2, SDL, autoreconfHook, makeDesktopItem }: stdenv.mkDerivation rec { - name = "vice-2.2"; + name = "vice-3.1"; src = fetchurl { - url = http://www.zimmers.net/anonftp/pub/cbm/crossplatform/emulators/VICE/vice-2.2.tar.gz; - sha256 = "0l8mp9ybx494fdqgr1ps4x3c3qzms4yyg4hzcn3ihzy92zw1nn2x"; + url = mirror://sourceforge/vice-emu/vice-3.1.tar.gz; + sha256 = "0h0jbml02s2a36hr78dxv1zshmfhxp1wadpcdl09aq416fb1bf1y"; }; - buildInputs = [ perl libpng giflib libjpeg alsaLib readline mesa - pkgconfig gtk2 SDL autoreconfHook ]; - configureFlags = "--with-sdl --enable-fullscreen --enable-gnomeui"; + buildInputs = [ bison flex perl libpng giflib libjpeg alsaLib readline mesa + pkgconfig gtk2 SDL autoreconfHook libXaw ]; + dontDisableStatic = true; + configureFlags = "--enable-fullscreen --enable-gnomeui"; desktopItem = makeDesktopItem { name = "vice"; @@ -23,12 +24,19 @@ stdenv.mkDerivation rec { categories = "Application;Emulator;"; }; + preBuild = '' + for i in src/resid src/resid-dtv + do + mkdir -pv $i/src + ln -sv ../../wrap-u-ar.sh $i/src + done + ''; patchPhase = '' # Disable font-cache update sed -i -e "s|install: install-data-am|install-no: install-data-am|" data/fonts/Makefile.am ''; - NIX_LDFLAGS = "-lX11 -L${libX11}/lib"; + #NIX_LDFLAGS = "-lX11 -L${libX11}/lib"; postInstall = '' mkdir -p $out/share/applications |