public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

treewide: explicitly specify gtk and related package versions

Browse Source
This commit is contained in:
Kirill Boltaev
2016-09-12 18:26:06 +03:00
parent 30107249b1
commit bccd75094f
339 changed files with 893 additions and 872 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/misc/emulators/fs-uae/default.nix
+2 -2
View File
@@ -1,5 +1,5 @@
{ stdenv, fetchurl, pkgconfig
, gettext, gtk, SDL, zlib, glib, openal, mesa, lua, freetype }:
, gettext, gtk2, SDL, zlib, glib, openal, mesa, lua, freetype }:
with stdenv.lib;
stdenv.mkDerivation rec{
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec{
sha256 = "05wngvpqj8kj4wzi5jzzhvs19iljb3m6ba1l2hk4rz68b400ndv6";
};
buildInputs = [ pkgconfig gettext gtk SDL zlib glib openal mesa lua freetype ];
buildInputs = [ pkgconfig gettext gtk2 SDL zlib glib openal mesa lua freetype ];
phases = "unpackPhase buildPhase installPhase";
pkgs/misc/emulators/gens-gs/default.nix
+2 -2
View File
@@ -1,4 +1,4 @@
{ stdenv, fetchurl, pkgconfig, gtk, SDL, nasm, zlib, libpng, mesa }:
{ stdenv, fetchurl, pkgconfig, gtk2, SDL, nasm, zlib, libpng, mesa }:
stdenv.mkDerivation {
name = "gens-gs-7";
@@ -8,7 +8,7 @@ stdenv.mkDerivation {
sha256 = "1ha5s6d3y7s9aq9f4zmn9p88109c3mrj36z2w68jhiw5xrxws833";
};
buildInputs = [ pkgconfig gtk SDL nasm zlib libpng mesa ];
buildInputs = [ pkgconfig gtk2 SDL nasm zlib libpng mesa ];
# Work around build failures on recent GTK+.
# See http://ubuntuforums.org/showthread.php?p=10535837
pkgs/misc/emulators/higan/default.nix
+2 -2
View File
@@ -4,7 +4,7 @@
, udev
, mesa, SDL
, libao, openal, libpulseaudio
, gtk, gtksourceview
, gtk2, gtksourceview
}:
with stdenv.lib;
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
postPatch = "sed '1i#include <cmath>' -i higan/fc/ppu/ppu.cpp";
buildInputs =
[ p7zip pkgconfig libX11 libXv udev mesa SDL libao openal libpulseaudio gtk gtksourceview ];
[ p7zip pkgconfig libX11 libXv udev mesa SDL libao openal libpulseaudio gtk2 gtksourceview ];
unpackPhase = ''
7z x $src
pkgs/misc/emulators/mess/default.nix
+2 -2
View File
@@ -1,4 +1,4 @@
{ stdenv, fetchurl, unzip, pkgconfig, SDL, gtk, GConf, mesa
{ stdenv, fetchurl, unzip, pkgconfig, SDL, gtk2, GConf, mesa
, expat, zlib }:
let
@@ -32,7 +32,7 @@ stdenv.mkDerivation {
makeFlags = "TARGET=mess BUILD_EXPAT= BUILD_ZLIB= NOWERROR=1";
buildInputs =
[ unzip pkgconfig SDL gtk GConf mesa expat zlib ];
[ unzip pkgconfig SDL gtk2 GConf mesa expat zlib ];
installPhase =
''
pkgs/misc/emulators/mupen64plus/default.nix
+2 -2
View File
@@ -1,4 +1,4 @@
{stdenv, fetchurl, which, pkgconfig, SDL, gtk, mesa, SDL_ttf}:
{stdenv, fetchurl, which, pkgconfig, SDL, gtk2, mesa, SDL_ttf}:
stdenv.mkDerivation {
name = "mupen64plus-1.5";
@@ -7,7 +7,7 @@ stdenv.mkDerivation {
sha256 = "0gygfgyr2sg4yx77ijk133d1ra0v1yxi4xjxrg6kp3zdjmhdmcjq";
};
buildInputs = [ which pkgconfig SDL gtk mesa SDL_ttf ];
buildInputs = [ which pkgconfig SDL gtk2 mesa SDL_ttf ];
hardeningDisable = [ "format" ];
pkgs/misc/emulators/snes9x-gtk/default.nix
+2 -2
View File
@@ -1,4 +1,4 @@
{stdenv, fetchurl, nasm, SDL, zlib, libpng, ncurses, mesa, intltool, gtk, pkgconfig, libxml2, xlibsWrapper, libpulseaudio}:
{stdenv, fetchurl, nasm, SDL, zlib, libpng, ncurses, mesa, intltool, gtk2, pkgconfig, libxml2, xlibsWrapper, libpulseaudio}:
stdenv.mkDerivation rec {
name = "snes9x-gtk-${version}";
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
sha256 = "9f7c5d2d0fa3fe753611cf94e8879b73b8bb3c0eab97cdbcb6ab7376efa78dc3";
};
buildInputs = [ nasm SDL zlib libpng ncurses mesa intltool gtk pkgconfig libxml2 xlibsWrapper libpulseaudio];
buildInputs = [ nasm SDL zlib libpng ncurses mesa intltool gtk2 pkgconfig libxml2 xlibsWrapper libpulseaudio];
sourceRoot = "snes9x-${version}-src/gtk";
pkgs/misc/emulators/uae/default.nix
+2 -2
View File
@@ -1,4 +1,4 @@
{stdenv, fetchurl, pkgconfig, gtk, alsaLib, SDL}:
{stdenv, fetchurl, pkgconfig, gtk2, alsaLib, SDL}:
stdenv.mkDerivation rec {
name = "uae-0.8.29";
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
configureFlags = [ "--with-sdl" "--with-sdl-sound" "--with-sdl-gfx" "--with-alsa" ];
buildInputs = [ pkgconfig gtk alsaLib SDL ];
buildInputs = [ pkgconfig gtk2 alsaLib SDL ];
hardeningDisable = [ "format" ];
pkgs/misc/emulators/vice/default.nix
+2 -2
View File
@@ -1,5 +1,5 @@
{ stdenv, fetchurl, perl, libpng, giflib, libjpeg, alsaLib, readline, mesa, libX11
, pkgconfig, gtk, SDL, autoreconfHook, makeDesktopItem
, pkgconfig, gtk2, SDL, autoreconfHook, makeDesktopItem
}:
stdenv.mkDerivation rec {
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
};
buildInputs = [ perl libpng giflib libjpeg alsaLib readline mesa
pkgconfig gtk SDL autoreconfHook ];
pkgconfig gtk2 SDL autoreconfHook ];
configureFlags = "--with-sdl --enable-fullscreen --enable-gnomeui";
desktopItem = makeDesktopItem {
pkgs/misc/emulators/wine/base.nix
+1 -1
View File
@@ -46,7 +46,7 @@ stdenv.mkDerivation ((lib.optionalAttrs (! isNull buildScript) {
++ lib.optional pulseaudioSupport pkgs.libpulseaudio
++ lib.optional xineramaSupport pkgs.xorg.libXinerama
++ lib.optionals gstreamerSupport (with pkgs.gst_all; [ gstreamer gst-plugins-base gst-plugins-good gst-plugins-bad gst-plugins-ugly gst-ffmpeg ])
++ lib.optionals gtkSupport [ pkgs.gtk3 pkgs.gnome.glib ]
++ lib.optionals gtkSupport [ pkgs.gtk3 pkgs.glib ]
++ lib.optionals openclSupport [ pkgs.opencl-headers pkgs.opencl-icd ]
++ lib.optionals xmlSupport [ pkgs.libxml2 pkgs.libxslt ]
++ lib.optionals tlsSupport [ pkgs.openssl pkgs.gnutls ]