Merge pull request #84698 from jtojnar/gnome2-cleanups

gnome2 cleanups
This commit is contained in:
Jan Tojnar 2020-04-08 15:58:33 +02:00 committed by GitHub
commit b7243c79c8
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 38 additions and 119 deletions

View file

@ -1,38 +0,0 @@
{ stdenv, fetchurl, zlib, guile, libart_lgpl, pkgconfig, intltool
, gtk2, glib, libogg, libvorbis, libgnomecanvas, gettext, perl }:
stdenv.mkDerivation rec {
name = "beast-0.7.1";
src = fetchurl {
url = "https://ftp.gtk.org/pub/beast/v0.7/${name}.tar.bz2";
sha256 = "0jyl1i1918rsn4296w07fsf6wx3clvad522m3bzgf8ms7gxivg5l";
};
buildInputs =
[ zlib guile libart_lgpl pkgconfig intltool gtk2 glib
libogg libvorbis libgnomecanvas gettext
];
patchPhase = ''
unset patchPhase; patchPhase
sed 's=-DG_DISABLE_DEPRECATED==g' -i `find -type f` # the patches didn't remove all occurences
sed 's=/bin/bash=/${stdenv.shell}=g' -i `find -type f`
sed 's=/usr/bin/perl=/${perl}/bin/perl=g' -i `find -type f`
'';
patches =
[ (fetchurl {
url = mirror://gentoo/distfiles/beast-0.7.1-guile-1.8.diff.bz2;
sha256 = "dc5194deff4b0a0eec368a69090db682d0c3113044ce2c2ed017ddfec9d3814e";
})
./patch.patch # patches taken from gentoo
];
meta = with stdenv.lib; {
description = "A music composition and modular synthesis application";
homepage = http://beast.gtk.org;
license = with licenses; [ gpl2 lgpl21 ];
broken = true;
};
}

View file

@ -1,25 +1,45 @@
{ stdenv, fetchurl, pkgconfig, intltool, gtk2, alsaLib, libglade }:
{ stdenv
, fetchurl
, pkg-config
, intltool
, gtk3
, wrapGAppsHook
, alsaLib
, libpulseaudio
, fftw
}:
stdenv.mkDerivation {
name = "lingot-0.9.1";
stdenv.mkDerivation rec {
pname = "lingot";
version = "1.0.1";
src = fetchurl {
url = mirror://savannah/lingot/lingot-0.9.1.tar.gz;
sha256 = "0ygras6ndw2fylwxx86ac11pcr2y2bcfvvgiwrh92z6zncx254gc";
url = "mirror://savannah/${pname}/${pname}-${version}.tar.gz";
sha256 = "cbjHe7mI6DhKDsv0yGHYOPe5hShKjhj3VTKrmBbGoA8=";
};
hardeningDisable = [ "format" ];
nativeBuildInputs = [
pkg-config
intltool
wrapGAppsHook
];
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ intltool gtk2 alsaLib libglade ];
buildInputs = [
gtk3
alsaLib
libpulseaudio
fftw
];
configureFlags = [ "--disable-jack" ];
configureFlags = [
"--disable-jack"
];
meta = {
description = "Not a Guitar-Only tuner";
homepage = https://www.nongnu.org/lingot/;
homepage = "https://www.nongnu.org/lingot/";
license = stdenv.lib.licenses.gpl2Plus;
platforms = with stdenv.lib.platforms; linux;
maintainers = with stdenv.lib.maintainers; [viric];
maintainers = with stdenv.lib.maintainers; [ viric ];
};
}

View file

@ -3,8 +3,8 @@
, libxml2, db, curl, fontconfig, libsndfile, neon
, bison, flex, zip, unzip, gtk3, gtk2, libmspack, getopt, file, cairo, which
, icu, boost, jdk, ant, cups, xorg, libcmis, fontforge
, openssl, gperf, cppunit, GConf, ORBit2, poppler, utillinux
, librsvg, gnome_vfs, libGLU, libGL, bsh, CoinMP, libwps, libabw, libmysqlclient
, openssl, gperf, cppunit, poppler, utillinux
, librsvg, libGLU, libGL, bsh, CoinMP, libwps, libabw, libmysqlclient
, autoconf, automake, openldap, bash, hunspell, librdf_redland, nss, nspr
, libwpg, dbus-glib, qt4, clucene_core, libcdr, lcms, vigra
, unixODBC, mdds, sane-backends, mythes, libexttextcat, libvisio
@ -347,13 +347,13 @@ in (stdenv.mkDerivation rec {
buildInputs = with xorg;
[ ant ArchiveZip boost cairo clucene_core
IOCompress cppunit cups curl db dbus-glib expat file flex fontconfig
freetype GConf getopt gnome_vfs gperf gtk3 gtk2
freetype getopt gperf gtk3 gtk2
hunspell icu jdk lcms libcdr libexttextcat unixODBC libjpeg
libmspack librdf_redland librsvg libsndfile libvisio libwpd libwpg libX11
libXaw libXext libXi libXinerama libxml2 libxslt libXtst
libXdmcp libpthreadstubs libGLU libGL mythes gst_all_1.gstreamer
gst_all_1.gst-plugins-base glib libmysqlclient
neon nspr nss openldap openssl ORBit2 pam perl pkgconfig poppler
neon nspr nss openldap openssl pam perl pkgconfig poppler
python3 sane-backends unzip vigra which zip zlib
mdds bluez5 libcmis libwps libabw libzmf
libxshmfence libatomic_ops graphite2 harfbuzz gpgme utillinux

View file

@ -1,4 +1,4 @@
{ stdenv, fetchurl, ocamlPackages, gnome2, pkgconfig, makeWrapper
{ stdenv, fetchurl, ocamlPackages, gnome2, pkgconfig, makeWrapper, glib
, libtool, libpng, yacc, expat, fontconfig, gd, pango, libjpeg, libwebp, xlibsWrapper, libXaw
}:
# We need an old version of Graphviz for format compatibility reasons.
@ -7,7 +7,7 @@ let graphviz_2_0 = import ./graphviz-2.0.nix {
inherit stdenv fetchurl pkgconfig xlibsWrapper libpng libjpeg expat libXaw
yacc libtool fontconfig pango gd libwebp;
}; in
let inherit (gnome2) libgnomecanvas glib; in
let inherit (gnome2) libgnomecanvas; in
let inherit (ocamlPackages) ocaml lablgtk camlp4; in
stdenv.mkDerivation rec {
version = "1.0.2";

View file

@ -1,51 +0,0 @@
{ stdenv, fetchcvs, ocaml, fuse, postgresql, pcre
, libuuid, gnome_vfs, pkgconfig, GConf }:
stdenv.mkDerivation {
name = "relfs-2008.03.05";
src = fetchcvs {
cvsRoot = ":pserver:anonymous@relfs.cvs.sourceforge.net:/cvsroot/relfs";
module = "relfs";
date = "2008-03-05";
sha256 = "949f8eff7e74ff2666cccf8a1efbfcce8d54bc41bec6ad6db8c029de7ca832a3";
};
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ ocaml fuse postgresql pcre libuuid gnome_vfs GConf ];
buildPhase = ''
cd deps
sed -e 's/^CPP/#&/ ; s/^# CPP=gcc/CPP=gcc/' -i Makefile.camlidl
make
cd ../src
sed -e 's/NULL\\|FALSE/0/g' -i Mimetype_lib.c
sed -e 's@/usr/local/@'\$out/'@' -i Makefile
sed -e '/install:/a\\\tmkdir -p '\$out'/share' -i Makefile
make
mkdir -p \$out/bin
echo '
createuser -A -D \$1
dropdb relfs_\$1 ;
rm -rf /tmp/relfs-\$1-tmp;
mkdir /tmp/relfs-\$1-tmp;
USER=\$1 relfs -f -s /tmp/relfs-\$1-tmp &
sleep 1 &&
kill -15 \''${!};
rm -rf /tmp/relfs-\$1-tmp ;
psql -d relfs_\$1 <<< \"ALTER DATABASE relfs_\$1 OWNER TO \$1;
ALTER TABLE obj OWNER TO \$1;
ALTER TABLE obj_mimetype OWNER TO \$1;
ALTER TABLE membership OWNER TO \$1;\"' > \$out/bin/relfs_grant;
chmod a+x \$out/bin/relfs_grant;
'';
meta = with stdenv.lib; {
description = "A relational filesystem on top of FUSE";
homepage = http://relfs.sourceforge.net;
license = licenses.gpl2;
maintainers = [ maintainers.raskin ];
platforms = platforms.linux;
broken = true;
};
}

View file

@ -6217,10 +6217,6 @@ in
reiserfsprogs = callPackage ../tools/filesystems/reiserfsprogs { };
relfs = callPackage ../tools/filesystems/relfs {
inherit (gnome2) gnome_vfs GConf;
};
remarkjs = callPackage ../development/web/remarkjs { };
alarm-clock-applet = callPackage ../tools/misc/alarm-clock-applet { };
@ -18523,11 +18519,6 @@ in
bb = callPackage ../applications/misc/bb { };
beast = callPackage ../applications/audio/beast {
inherit (gnome2) libgnomecanvas libart_lgpl;
guile = guile_1_8;
};
bevelbar = callPackage ../applications/window-managers/bevelbar { };
bibletime = libsForQt5.callPackage ../applications/misc/bibletime { };
@ -20290,7 +20281,6 @@ in
libreoffice-args = {
inherit (perlPackages) ArchiveZip IOCompress;
inherit (gnome2) GConf ORBit2 gnome_vfs;
zip = zip.override { enableNLS = false; };
fontsConf = makeFontsConf {
fontDirectories = [
@ -20333,9 +20323,7 @@ in
portaudio = portaudio2014;
};
lingot = callPackage ../applications/audio/lingot {
inherit (gnome2) libglade;
};
lingot = callPackage ../applications/audio/lingot { };
linuxband = callPackage ../applications/audio/linuxband { };