Unverified Commit d858c8d7 authored by K900's avatar K900 Committed by GitHub
Browse files

Merge pull request #278673 from K900/libaccounts-glib-1.26 

libaccounts-glib: 1.24 -> 1.26 + some more accounts-sso cleanup
parents 4664f806 6d0fa8c7

pkgs/development/libraries/accounts-qt/default.nix

+6 −5
Original line number Diff line number Diff line 
{ mkDerivation, lib, fetchFromGitLab, doxygen, glib, libaccounts-glib, pkg-config, qmake }:

{ stdenv, lib, fetchFromGitLab, doxygen, glib, libaccounts-glib, pkg-config, qmake, qtbase, wrapQtAppsHook }:



mkDerivation rec {

stdenv.mkDerivation rec {

  pname = "accounts-qt";

  version = "1.16";
@@ -12,9 +12,10 @@ mkDerivation rec { 
  };



  propagatedBuildInputs = [ glib libaccounts-glib ];

  nativeBuildInputs = [ doxygen pkg-config qmake ];

  buildInputs = [ qtbase ];

  nativeBuildInputs = [ doxygen pkg-config qmake wrapQtAppsHook ];



  # remove forbidden references to $TMPDIR

  # remove forbidden references to /build

  preFixup = ''

    patchelf --shrink-rpath --allowed-rpath-prefixes "$NIX_STORE" "$out"/bin/*

  '';
@@ -23,6 +24,6 @@ mkDerivation rec { 
    description = "Qt library for accessing the online accounts database";

    homepage = "https://gitlab.com/accounts-sso";

    license = licenses.lgpl21;

    platforms = with platforms; linux;

    platforms = platforms.linux;

  };

}

pkgs/development/libraries/libaccounts-glib/default.nix

+2 −5
Original line number Diff line number Diff line
@@ -3,7 +3,7 @@ 


stdenv.mkDerivation rec {

  pname = "libaccounts-glib";

  version = "1.24";

  version = "1.26";



  outputs = [ "out" "dev" "devdoc" "py" ];
@@ -11,12 +11,9 @@ stdenv.mkDerivation rec { 
    owner = "accounts-sso";

    repo = "libaccounts-glib";

    rev = version;

    sha256 = "0y8smg1rd279lrr9ad8b499i8pbkajmwd4xn41rdh9h93hs9apn7";

    sha256 = "sha256-KVKylt+XjLfidsS2KzT7oFXP6rTR528lYAUP8dffu7k=";

  };



  # See: https://gitlab.com/accounts-sso/libaccounts-glib/merge_requests/22

  patches = [ ./py-override.patch ];



  nativeBuildInputs = [

    check

    docbook_xml_dtd_43

pkgs/development/libraries/libaccounts-glib/py-override.patch

deleted100644 → 0
+0 −38
Original line number Diff line number Diff line 
diff --git a/libaccounts-glib/pygobject/meson.build b/libaccounts-glib/pygobject/meson.build

index fa1f4a0..588c4ce 100644

--- a/libaccounts-glib/pygobject/meson.build

+++ b/libaccounts-glib/pygobject/meson.build

@@ -1,11 +1,19 @@

-python3 = import('python3')

-python_exec = python3.find_python()

-python_exec_result = run_command(python_exec, ['-c', 'import gi; from os.path import abspath; print(abspath(gi._overridesdir))'])

+py_override = get_option('py-overrides-dir')

 

-if python_exec_result.returncode() != 0

-    error('Failed to retreive the python GObject override directory')

+if py_override == ''

+    python3 = import('python3')

+    python_exec = python3.find_python()

+    

+    python_exec_result = run_command(python_exec, ['-c', 'import gi; from os.path import abspath; print(abspath(gi._overridesdir))'])

+

+    if python_exec_result.returncode() != 0

+        error('Failed to retreive the python GObject override directory')

+    endif

+

+    py_override = python_exec_result.stdout().strip()

 endif

 

-install_data('Accounts.py',

-    install_dir: join_paths(python_exec_result.stdout().strip())

+install_data(

+    'Accounts.py',

+    install_dir: py_override

 )

diff --git a/meson_options.txt  b/meson_options.txt 

new file mode 100644

index 0000000..2c33804

--- /dev/null

+++ b/meson_options.txt 	

@@ -0,0 +1 @@

+option('py-overrides-dir', type : 'string', value : '', description: 'Path to pygobject overrides directory')

pkgs/development/libraries/signond/default.nix

+6 −3
Original line number Diff line number Diff line 
{ mkDerivation, lib, fetchFromGitLab, qmake, doxygen }:

{ stdenv, lib, fetchFromGitLab, qmake, qtbase, wrapQtAppsHook, doxygen }:



mkDerivation rec {

stdenv.mkDerivation rec {

  pname = "signond";

  version = "8.61";
@@ -14,8 +14,11 @@ mkDerivation rec { 
  nativeBuildInputs = [

    qmake

    doxygen

    wrapQtAppsHook

  ];



  buildInputs = [ qtbase ];



  preConfigure = ''

    substituteInPlace src/signond/signond.pro \

      --replace "/etc" "@out@/etc"