Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix package aliases that were removed in NixOS 22.05 #310

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix package aliases that were removed in NixOS 22.05 #310

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions pkgs/gcc-4.7/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ let version = "4.7.3";
sha256 = "1f41j0y4kjydl71lqlvr73yagrs2jsg1fjymzjz66mjy7al5lh09";
};

xlibs = [
Copy link
Contributor

@Artturin Artturin Apr 28, 2023 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this is just a list containing the necessary x libraries so it shouldn't be changed (or change it to xLibs to differentiate it from the xlibs)

xorg = [
libX11 libXt libSM libICE libXtst libXrender libXrandr libXi
xproto renderproto xextproto inputproto randrproto
];
Expand Down Expand Up @@ -199,7 +199,7 @@ let version = "4.7.3";
in

# We need all these X libraries when building AWT with GTK+.
assert gtk != null -> (filter (x: x == null) xlibs) == [];
assert gtk != null -> (filter (x: x == null) xorg) == [];

stdenv.mkDerivation ({
name = "${name}${if stripped then "" else "-debug"}-${version}" + crossNameAddon;
Expand Down Expand Up @@ -279,7 +279,7 @@ stdenv.mkDerivation ({
++ (optional (cloog != null) cloog)
++ (optional (zlib != null) zlib)
++ (optionals langJava [ boehmgc zip unzip ])
++ (optionals javaAwtGtk ([ gtk libart_lgpl ] ++ xlibs))
++ (optionals javaAwtGtk ([ gtk libart_lgpl ] ++ xorg))
++ (optionals (cross != null) [binutilsCross])
++ (optionals langAda [gnatboot])
++ (optionals langVhdl [gnat])
Expand Down Expand Up @@ -458,7 +458,7 @@ stdenv.mkDerivation ({
(intersperse ":" (map (x: x + "/include")
(optionals (zlib != null) [ zlib ]
++ optionals langJava [ boehmgc ]
++ optionals javaAwtGtk xlibs
++ optionals javaAwtGtk xorg
++ optionals javaAwtGtk [ gmp mpfr ]
++ optional (libpthread != null) libpthread
++ optional (libpthreadCross != null) libpthreadCross
Expand All @@ -473,7 +473,7 @@ stdenv.mkDerivation ({
(intersperse ":" (map (x: x + "/lib")
(optionals (zlib != null) [ zlib ]
++ optionals langJava [ boehmgc ]
++ optionals javaAwtGtk xlibs
++ optionals javaAwtGtk xorg
++ optionals javaAwtGtk [ gmp mpfr ]
++ optional (libpthread != null) libpthread)));

Expand Down
30 changes: 15 additions & 15 deletions pkgs/gecko/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
{ geckoSrc ? null, lib
, stdenv, fetchFromGitHub, pythonFull, which, autoconf213, m4
, perl, unzip, zip, gnumake, yasm, pkgconfig, xlibs, gnome2, pango, freetype, fontconfig, cairo
, dbus, dbus_glib, alsaLib, libpulseaudio
, gtk3, glib, gobjectIntrospection, gdk_pixbuf, atk, gtk2
, perl, unzip, zip, gnumake, yasm, pkgconfig, xorg, gnome2, pango, freetype, fontconfig, cairo
, dbus, dbus-glib, alsaLib, libpulseaudio
, gtk3, glib, gobject-introspection, gdk-pixbuf, atk, gtk2
, git, mercurial, openssl, cmake, procps
, libnotify
, valgrind, gdb, rr
Expand All @@ -13,7 +13,7 @@
, llvm, llvmPackages, nasm
, ccache

, zlib, xorg
, zlib
, rust-cbindgen
, nodejs
, jsdoc
Expand Down Expand Up @@ -46,15 +46,15 @@ let
# Expected by the configure script
perl unzip zip gnumake yasm pkgconfig

xlibs.libICE xlibs.libSM xlibs.libX11 xlibs.libXau xlibs.libxcb
xlibs.libXdmcp xlibs.libXext xlibs.libXt xlibs.libXtst
xlibs.libXcomposite
xlibs.libXfixes
xlibs.libXdamage xlibs.libXrender
] ++ (if xlibs ? xproto then [
xlibs.damageproto xlibs.printproto xlibs.kbproto
xlibs.renderproto xlibs.xextproto xlibs.xproto
xlibs.compositeproto xlibs.fixesproto
xorg.libICE xorg.libSM xorg.libX11 xorg.libXau xorg.libxcb
xorg.libXdmcp xorg.libXext xorg.libXt xorg.libXtst
xorg.libXcomposite
xorg.libXfixes
xorg.libXdamage xorg.libXrender
] ++ (if xorg ? xproto then [
xorg.damageproto xorg.printproto xorg.kbproto
xorg.renderproto xorg.xextproto xorg.xproto
xorg.compositeproto xorg.fixesproto
] else [
xorg.xorgproto
]) ++ [
Expand All @@ -64,11 +64,11 @@ let

pango freetype fontconfig cairo

dbus dbus_glib
dbus dbus-glib

alsaLib libpulseaudio

gtk3 glib gobjectIntrospection gdk_pixbuf atk
gtk3 glib gobject-introspection gdk-pixbuf atk
gtk2 gnome2.GConf

rust
Expand Down