diff options
Diffstat (limited to 'pkgs/desktops')
5 files changed, 52 insertions, 9 deletions
diff --git a/pkgs/desktops/gnome-2/platform/GConf/default.nix b/pkgs/desktops/gnome-2/platform/GConf/default.nix index 8419c1a7d730e..33430f453ab58 100644 --- a/pkgs/desktops/gnome-2/platform/GConf/default.nix +++ b/pkgs/desktops/gnome-2/platform/GConf/default.nix @@ -11,14 +11,16 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" "man" ]; - buildInputs = [ ORBit2 libxml2 python3 ] + strictDeps = true; + + buildInputs = [ ORBit2 libxml2 ] # polkit requires pam, which requires shadow.h, which is not available on # darwin ++ lib.optional (!stdenv.isDarwin) polkit; propagatedBuildInputs = [ glib dbus-glib ]; - nativeBuildInputs = [ pkg-config intltool ]; + nativeBuildInputs = [ pkg-config intltool python3 glib ]; configureFlags = # fixes the "libgconfbackend-oldxml.so is not portable" error on darwin diff --git a/pkgs/desktops/gnome-2/platform/ORBit2/default.nix b/pkgs/desktops/gnome-2/platform/ORBit2/default.nix index a45095ba49780..28bc04697b878 100644 --- a/pkgs/desktops/gnome-2/platform/ORBit2/default.nix +++ b/pkgs/desktops/gnome-2/platform/ORBit2/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkg-config, glib, libIDL, libintl }: +{ lib, stdenv, fetchurl, pkg-config, glib, libIDL, libintl, buildPackages }: stdenv.mkDerivation rec { pname = "ORBit2"; @@ -9,11 +9,34 @@ stdenv.mkDerivation rec { sha256 = "0l3mhpyym9m5iz09fz0rgiqxl2ym6kpkwpsp1xrr4aa80nlh1jam"; }; + strictDeps = true; + + # Processing file orbit-interface.idl + # sh: gcc: not found + # output does not contain binaries for build + depsBuildBuild = [ buildPackages.stdenv.cc ]; nativeBuildInputs = [ pkg-config libintl ]; propagatedBuildInputs = [ glib libIDL ]; outputs = [ "out" "dev" ]; + configureFlags = lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [ + "--with-idl-compiler=${lib.getExe' buildPackages.gnome2.ORBit2 "orbit-idl-2"}" + # https://github.com/void-linux/void-packages/blob/e5856e02aa6ef7e4f2725afbff2915f89d39024b/srcpkgs/ORBit2/template#L17-L35 + "ac_cv_alignof_CORBA_boolean=1" + "ac_cv_alignof_CORBA_char=1" + "ac_cv_alignof_CORBA_double=8" + "ac_cv_alignof_CORBA_float=4" + "ac_cv_alignof_CORBA_long=4" + "ac_cv_alignof_CORBA_long_double=8" + "ac_cv_alignof_CORBA_long_long=8" + "ac_cv_alignof_CORBA_octet=1" + "ac_cv_alignof_CORBA_short=2" + "ac_cv_alignof_CORBA_struct=1" + "ac_cv_alignof_CORBA_wchar=2" + "ac_cv_alignof_CORBA_pointer=${if stdenv.hostPlatform.is64bit then "8" else "4"}" + ]; + preBuild = '' sed 's/-DG_DISABLE_DEPRECATED//' -i linc2/src/Makefile ''; diff --git a/pkgs/desktops/gnome-2/platform/libIDL/default.nix b/pkgs/desktops/gnome-2/platform/libIDL/default.nix index 61b21ba88c015..c8c40de9d44cf 100644 --- a/pkgs/desktops/gnome-2/platform/libIDL/default.nix +++ b/pkgs/desktops/gnome-2/platform/libIDL/default.nix @@ -9,7 +9,15 @@ stdenv.mkDerivation rec { sha256 = "08129my8s9fbrk0vqvnmx6ph4nid744g5vbwphzkaik51664vln5"; }; + strictDeps = true; + buildInputs = [ glib gettext ]; nativeBuildInputs = [ flex bison pkg-config ]; + + configureFlags = lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [ + # before openembedded removed libIDL + # the result was always ll https://lists.openembedded.org/g/openembedded-core/topic/85775262?p=%2C%2C%2C20%2C0%2C0%2C0%3A%3A%2C%2C%2C0%2C0%2C0%2C85775262 + "libIDL_cv_long_long_format=ll" + ]; } diff --git a/pkgs/desktops/gnome-2/platform/libglade/default.nix b/pkgs/desktops/gnome-2/platform/libglade/default.nix index 2f2641a9a5c80..dc6e192ed1616 100644 --- a/pkgs/desktops/gnome-2/platform/libglade/default.nix +++ b/pkgs/desktops/gnome-2/platform/libglade/default.nix @@ -11,10 +11,18 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" ]; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ gtk2 gettext ]; - - NIX_LDFLAGS = "-lgmodule-2.0"; + strictDeps = true; + nativeBuildInputs = [ pkg-config gettext ]; + buildInputs = [ gtk2 ]; propagatedBuildInputs = [ libxml2 ]; + + postPatch = '' + # uses pkg-config in some places and uses the correct $PKG_CONFIG in some + # it's an ancient library so it has very old configure scripts and m4 + substituteInPlace ./configure \ + --replace "pkg-config" "$PKG_CONFIG" + ''; + + NIX_LDFLAGS = "-lgmodule-2.0"; } diff --git a/pkgs/desktops/gnome-2/platform/libgnomecanvas/default.nix b/pkgs/desktops/gnome-2/platform/libgnomecanvas/default.nix index b856442290a4a..529e73b874787 100644 --- a/pkgs/desktops/gnome-2/platform/libgnomecanvas/default.nix +++ b/pkgs/desktops/gnome-2/platform/libgnomecanvas/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkg-config, gtk2, intltool, libart_lgpl, libglade }: +{ lib, stdenv, fetchurl, pkg-config, gtk2, intltool, libart_lgpl, libglade, glib }: stdenv.mkDerivation rec { pname = "libgnomecanvas"; @@ -11,7 +11,9 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" ]; + strictDeps = true; + buildInputs = [ libglade ]; - nativeBuildInputs = [ pkg-config intltool ]; + nativeBuildInputs = [ pkg-config intltool glib ]; propagatedBuildInputs = [ libart_lgpl gtk2 ]; } |