nixpkgs mirror (for testing) github.com/NixOS/nixpkgs
nix
fork

Configure Feed

Select the types of activity you want to include in your feed.

malcontent-ui: split from malcontent

The 0.7.0 update allows us to split the package.

+122 -11
+4 -1
nixos/modules/services/desktops/malcontent.nix
··· 23 23 24 24 config = mkIf config.services.malcontent.enable { 25 25 26 - environment.systemPackages = [ pkgs.malcontent ]; 26 + environment.systemPackages = with pkgs; [ 27 + malcontent 28 + malcontent-ui 29 + ]; 27 30 28 31 services.dbus.packages = [ pkgs.malcontent ]; 29 32
+35
pkgs/development/libraries/malcontent/better-separation.patch
··· 1 + diff --git a/meson.build b/meson.build 2 + index a6c477d..f7b2f0a 100644 3 + --- a/meson.build 4 + +++ b/meson.build 5 + @@ -125,8 +125,8 @@ test_env = [ 6 + 'LC_ALL=C.UTF-8', 7 + ] 8 + 9 + -subdir('accounts-service') 10 + if not get_option('use_system_libmalcontent') 11 + + subdir('accounts-service') 12 + subdir('libmalcontent') 13 + else 14 + libmalcontent_api_version = '0' 15 + @@ -137,11 +137,17 @@ endif 16 + if get_option('ui').enabled() 17 + subdir('libmalcontent-ui') 18 + endif 19 + -subdir('malcontent-client') 20 + +if not get_option('use_system_libmalcontent') 21 + + subdir('malcontent-client') 22 + +endif 23 + if get_option('ui').enabled() 24 + subdir('malcontent-control') 25 + endif 26 + -subdir('pam') 27 + +if not get_option('use_system_libmalcontent') 28 + + subdir('pam') 29 + +endif 30 + subdir('po') 31 + 32 + -meson.add_install_script('build-aux/meson_post_install.py') 33 + +if get_option('ui').enabled() 34 + + meson.add_install_script('build-aux/meson_post_install.py') 35 + +endif
+4 -6
pkgs/development/libraries/malcontent/default.nix
··· 9 9 , coreutils 10 10 , accountsservice 11 11 , dbus 12 - , flatpak 13 - , gtk3 14 12 , pam 15 - , desktop-file-utils 16 13 , polkit 17 14 , glib-testing 18 15 , python3 ··· 33 36 patches = [ 34 37 # Allow installing installed tests to a separate output. 35 38 ./installed-tests-path.patch 39 + 40 + # Do not build things that are part of malcontent-ui package 41 + ./better-separation.patch 36 42 ]; 37 43 38 44 nativeBuildInputs = [ ··· 43 43 ninja 44 44 pkgconfig 45 45 gobject-introspection 46 - desktop-file-utils 47 46 wrapGAppsHook 48 47 ]; 49 48 50 49 buildInputs = [ 51 50 accountsservice 52 51 dbus 53 - flatpak 54 - gtk3 55 52 pam 56 53 polkit 57 54 glib-testing ··· 64 67 mesonFlags = [ 65 68 "-Dinstalled_tests=true" 66 69 "-Dinstalled_test_prefix=${placeholder "installedTests"}" 70 + "-Dui=disabled" 67 71 ]; 68 72 69 73 postPatch = ''
+7 -4
pkgs/development/libraries/malcontent/installed-tests-path.patch
··· 22 22 \ No newline at end of file 23 23 +endforeach 24 24 diff --git a/meson_options.txt b/meson_options.txt 25 - index 06329d4..72aa505 100644 25 + index d516c70..583cb94 100644 26 26 --- a/meson_options.txt 27 27 +++ b/meson_options.txt 28 - @@ -9,3 +9,9 @@ option( 29 - type: 'string', 30 - description: 'directory for PAM modules' 28 + @@ -4,6 +4,12 @@ option( 29 + value: false, 30 + description: 'enable installed tests' 31 31 ) 32 32 +option( 33 33 + 'installed_test_prefix', ··· 35 35 + value: '', 36 36 + description: 'Prefix for installed tests' 37 37 +) 38 + option( 39 + 'pamlibdir', 40 + type: 'string', 38 41 diff --git a/pam/tests/meson.build b/pam/tests/meson.build 39 42 index 0560dcb..a74dab2 100644 40 43 --- a/pam/tests/meson.build
+70
pkgs/development/libraries/malcontent/ui.nix
··· 1 + { stdenv 2 + , meson 3 + , ninja 4 + , pkg-config 5 + , gobject-introspection 6 + , wrapGAppsHook 7 + , glib 8 + , accountsservice 9 + , dbus 10 + , flatpak 11 + , malcontent 12 + , gtk3 13 + , desktop-file-utils 14 + , polkit 15 + , glib-testing 16 + }: 17 + 18 + stdenv.mkDerivation rec { 19 + pname = "malcontent-ui"; 20 + 21 + inherit (malcontent) version src; 22 + 23 + outputs = [ "bin" "out" "dev" ]; 24 + 25 + patches = [ 26 + # Allow installing installed tests to a separate output. 27 + ./installed-tests-path.patch 28 + 29 + # Do not build things that are part of malcontent package 30 + ./better-separation.patch 31 + ]; 32 + 33 + nativeBuildInputs = [ 34 + meson 35 + ninja 36 + pkg-config 37 + gobject-introspection 38 + desktop-file-utils 39 + wrapGAppsHook 40 + ]; 41 + 42 + buildInputs = [ 43 + dbus 44 + polkit 45 + glib-testing 46 + flatpak 47 + ]; 48 + 49 + propagatedBuildInputs = [ 50 + accountsservice 51 + malcontent 52 + glib 53 + gtk3 54 + ]; 55 + 56 + mesonFlags = [ 57 + "-Dinstalled_tests=true" 58 + "-Dinstalled_test_prefix=${placeholder "installedTests"}" 59 + "-Duse_system_libmalcontent=true" 60 + "-Dui=enabled" 61 + ]; 62 + 63 + meta = with stdenv.lib; { 64 + description = "UI components for parental controls library"; 65 + homepage = "https://gitlab.freedesktop.org/pwithnall/malcontent"; 66 + license = licenses.lgpl21Plus; 67 + maintainers = with maintainers; [ jtojnar ]; 68 + platforms = platforms.unix; 69 + }; 70 + }
+2
pkgs/top-level/all-packages.nix
··· 12962 12962 12963 12963 malcontent = callPackage ../development/libraries/malcontent { }; 12964 12964 12965 + malcontent-ui = callPackage ../development/libraries/malcontent/ui.nix { }; 12966 + 12965 12967 libmanette = callPackage ../development/libraries/libmanette { }; 12966 12968 12967 12969 libmatchbox = callPackage ../development/libraries/libmatchbox { };