Unverified Commit 7a2c8f9c authored by Jan Tojnar's avatar Jan Tojnar Committed by GitHub
Browse files

Merge pull request #322986 from jtojnar/gnome-vfs-dependents 

Remove some gnome2 dependents
parents 08683639 3c24501e

pkgs/applications/graphics/shutter/default.nix

+0 −2
Original line number Diff line number Diff line
@@ -15,8 +15,6 @@ 


let

  perlModules = with perlPackages; [

      # Not sure if these are needed

      # Gnome2 Gnome2Canvas Gnome2VFS Gtk2AppIndicator Gtk2Unique

      ImageMagick

      Cairo

      FileBaseDir

pkgs/applications/misc/verbiste/default.nix

+5 −5
Original line number Diff line number Diff line 
{ lib, stdenv, fetchurl, pkg-config, libgnomeui, libxml2 }:

{ lib, stdenv, fetchurl, pkg-config, gtk2, libxml2 }:



stdenv.mkDerivation rec {

  pname = "verbiste";



  version = "0.1.47";

  version = "0.1.48";



  src = fetchurl {

    url = "https://perso.b2b2c.ca/~sarrazip/dev/${pname}-${version}.tar.gz";

    sha256 = "02kzin3pky2q2jnihrch8y0hy043kqqmzxq8j741x80kl0j1qxkm";

    url = "https://perso.b2b2c.ca/~sarrazip/dev/verbiste-${version}.tar.gz";

    hash = "sha256-qp0OFpH4DInWjzraDI6+CeKh85JkbwVYHlJruIrGnBM=";

  };



  nativeBuildInputs = [ pkg-config ];



  buildInputs = [ libgnomeui libxml2 ];

  buildInputs = [ gtk2 libxml2 ];



  enableParallelBuilding = true;

pkgs/applications/video/coriander/default.nix

deleted100644 → 0
+0 −45
Original line number Diff line number Diff line 
{ lib

, stdenv

, fetchurl

, pkg-config

, glib

, gtk2

, libgnomeui

, libXv

, libraw1394

, libdc1394

, SDL

, automake

, GConf

}:



stdenv.mkDerivation rec {

  pname = "coriander";

  version = "2.0.1";



  src = fetchurl {

    url = "http://damien.douxchamps.net/ieee1394/coriander/archives/coriander-${version}.tar.gz";

    sha256 = "0l6hpfgy5r4yardilmdrggsnn1fbfww516sk5a90g1740cd435x5";

  };



  # Workaround build failure on -fno-common toolchains:

  #   ld: subtitles.o:src/coriander.h:110: multiple definition of

  #     `main_window'; main.o:src/coriander.h:110: first defined here

  env.NIX_CFLAGS_COMPILE = "-fcommon";



  preConfigure = ''

    cp ${automake}/share/automake-*/mkinstalldirs .

  '';



  nativeBuildInputs = [ pkg-config ];

  buildInputs = [ glib gtk2 libgnomeui libXv libraw1394 libdc1394 SDL GConf ];



  meta = {

    homepage = "https://damien.douxchamps.net/ieee1394/coriander/";

    description = "GUI for controlling a Digital Camera through the IEEE1394 bus";

    license = lib.licenses.gpl3Plus;

    maintainers = with lib.maintainers; [ viric ];

    platforms = with lib.platforms; linux;

    mainProgram = "coriander";

  };

}

pkgs/applications/video/dvdstyler/default.nix

+1 −3
Original line number Diff line number Diff line
@@ -24,7 +24,6 @@ 
, zip



, dvdisasterSupport ? true, dvdisaster ? null

, thumbnailSupport ? true, libgnomeui ? null

, udevSupport ? true, udev ? null

, dbusSupport ? true, dbus ? null

}:
@@ -72,8 +71,7 @@ in stdenv.mkDerivation rec { 
 ]

  ++ optionals dvdisasterSupport [ dvdisaster ]

  ++ optionals udevSupport [ udev ]

  ++ optionals dbusSupport [ dbus ]

  ++ optionals thumbnailSupport [ libgnomeui ];

  ++ optionals dbusSupport [ dbus ];



  enableParallelBuilding = true;

pkgs/games/gtetrinet/default.nix

deleted100644 → 0
+0 −46
Original line number Diff line number Diff line 
{ fetchFromGitHub, lib, stdenv, autoreconfHook, intltool, pkg-config, libgnome, libgnomeui, GConf }:



stdenv.mkDerivation {

  pname = "gtetrinet";

  version = "0.7.11";



  src = fetchFromGitHub {

    owner = "GNOME";

    repo = "gtetrinet";

    rev = "6be3df83f3dc5c7cb966e6cd447182df01b93222";

    sha256 = "1y05x8lfyxvkjg6c87cfd0xxmb22c88scx8fq3gah7hjy5i42v93";

  };



  nativeBuildInputs = [ autoreconfHook intltool pkg-config ];



  buildInputs = [ libgnome libgnomeui ];



  propagatedUserEnvPkgs = [ GConf ];



  postAutoreconf = ''

    intltoolize --force

  '';



  preInstall = ''

    export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1

  '';



  postInstall = ''

    mv "$out/games" "$out/bin"

  '';



  enableParallelBuilding = true;



  meta = {

    description = "Client for Tetrinet, a multiplayer online Tetris game";

    mainProgram = "gtetrinet";

    longDescription = ''

      GTetrinet is a client program for Tetrinet, a multiplayer tetris game

      that is played over the internet.

    '';

    homepage = "https://gtetrinet.sourceforge.net/";

    license = lib.licenses.gpl2;

    platforms = lib.platforms.unix;

    maintainers = [ lib.maintainers.chris-martin ];

  };

}