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

Merge pull request #89420 from romildo/fix.lxappearance

Browse Source 
lxappearance: default to Gtk3
This commit is contained in:
José Romildo Malaquias 2020-06-05 10:08:30 -03:00 committed by GitHub
commit e0e9b9fb07
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 31 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
pkgs/desktops/lxde/core/lxappearance/default.nix
View File

@ -1,26 +1,42 @@
{ stdenv, fetchurl, intltool, pkgconfig, libX11, gtk2, withGtk3 ? false, gtk3 }: { stdenv
, fetchurl
, intltool
, pkg-config
, libX11
, gtk2
, gtk3
, withGtk3 ? true
}:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "lxappearance-0.6.3"; name = "lxappearance-0.6.3";
src = fetchurl{ src = fetchurl {
url = "mirror://sourceforge/project/lxde/LXAppearance/${name}.tar.xz"; url = "mirror://sourceforge/project/lxde/LXAppearance/${name}.tar.xz";
sha256 = "0f4bjaamfxxdr9civvy55pa6vv9dx1hjs522gjbbgx7yp1cdh8kj"; sha256 = "0f4bjaamfxxdr9civvy55pa6vv9dx1hjs522gjbbgx7yp1cdh8kj";
}; };
nativeBuildInputs = [ pkgconfig intltool ]; nativeBuildInputs = [
pkg-config
intltool
];
buildInputs = [ libX11 (if withGtk3 then gtk3 else gtk2) ]; buildInputs = [
libX11
(if withGtk3 then gtk3 else gtk2)
];
patches = [ ./lxappearance-0.6.3-xdg.system.data.dirs.patch ]; patches = [
./lxappearance-0.6.3-xdg.system.data.dirs.patch
];
configureFlags = stdenv.lib.optional withGtk3 "--enable-gtk3"; configureFlags = stdenv.lib.optional withGtk3 "--enable-gtk3";
meta = { meta = with stdenv.lib; {
description = "A lightweight program for configuring the theme and fonts of gtk applications"; description = "Lightweight program for configuring the theme and fonts of gtk applications";
homepage = "https://lxde.org/"; homepage = "https://lxde.org/";
maintainers = [ stdenv.lib.maintainers.hinton ]; license = licenses.gpl2;
platforms = stdenv.lib.platforms.linux; platforms = platforms.linux;
license = stdenv.lib.licenses.gpl2; maintainers = with maintainers; [ hinton romildo ];
}; };
} }

1
pkgs/top-level/aliases.nix
View File

@ -276,6 +276,7 @@ mapAliases ({
lua5_1_sockets = lua51Packages.luasocket; # added 2017-05-02 lua5_1_sockets = lua51Packages.luasocket; # added 2017-05-02
lua5_expat = luaPackages.luaexpat; # added 2017-05-02 lua5_expat = luaPackages.luaexpat; # added 2017-05-02
lua5_sec = luaPackages.luasec; # added 2017-05-02 lua5_sec = luaPackages.luasec; # added 2017-05-02
lxappearance-gtk3 = throw "lxappearance-gtk3 has been removed. Use lxappearance instead, which now defaults to Gtk3"; # added 2020-06-03
m3d-linux = m33-linux; # added 2016-08-13 m3d-linux = m33-linux; # added 2016-08-13
man_db = man-db; # added 2016-05 man_db = man-db; # added 2016-05
manpages = man-pages; # added 2015-12-06 manpages = man-pages; # added 2015-12-06

9
pkgs/top-level/all-packages.nix
View File

@ -9507,12 +9507,11 @@ in
nodejs = nodejs-13_x; nodejs = nodejs-13_x;
}; };
lxappearance = callPackage ../desktops/lxde/core/lxappearance { lxappearance = callPackage ../desktops/lxde/core/lxappearance { };
gtk2 = gtk2-x11;
};
lxappearance-gtk3 = lxappearance.override { lxappearance-gtk2 = callPackage ../desktops/lxde/core/lxappearance {
withGtk3 = true; gtk2 = gtk2-x11;
withGtk3 = false;
}; };
lxmenu-data = callPackage ../desktops/lxde/core/lxmenu-data.nix { }; lxmenu-data = callPackage ../desktops/lxde/core/lxmenu-data.nix { };