diff options
| author | Malte Brandy <malte.brandy@maralorn.de> | 2021-05-07 21:42:42 +0200 |
|---|---|---|
| committer | Malte Brandy <malte.brandy@maralorn.de> | 2021-05-07 21:42:42 +0200 |
| commit | d75130019b38ef8ceb2d62a5d868ea4a31242b6e (patch) | |
| tree | 218a73f6429ffb83eafaea4e4510363760b2593e | |
| parent | 9fd589504eb629d84e5852e76fbc2708944c7877 (diff) | |
| download | nixpkgs-d75130019b38ef8ceb2d62a5d868ea4a31242b6e.tar nixpkgs-d75130019b38ef8ceb2d62a5d868ea4a31242b6e.tar.gz nixpkgs-d75130019b38ef8ceb2d62a5d868ea4a31242b6e.tar.bz2 nixpkgs-d75130019b38ef8ceb2d62a5d868ea4a31242b6e.tar.lz nixpkgs-d75130019b38ef8ceb2d62a5d868ea4a31242b6e.tar.xz nixpkgs-d75130019b38ef8ceb2d62a5d868ea4a31242b6e.tar.zst nixpkgs-d75130019b38ef8ceb2d62a5d868ea4a31242b6e.zip | |
haskellPackages.gi-*: Fix some builds
3 files changed, 26 insertions, 0 deletions
diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index e1b40d87759..f84e4d04873 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -1313,6 +1313,8 @@ self: super: { gi-gtk-hs = self.gi-gtk-hs_0_3_10; gi-dbusmenu = self.gi-dbusmenu_0_4_9; gi-xlib = self.gi-xlib_2_0_10; + gi-gdkx11 = self.gi-gdkx11_3_0_11; + gi-dbusmenugtk3 = self.gi-dbusmenugtk3_0_4_10; # 2021-05-17: Needs some manual patching to be compatible with haskell-gi-base 0.25 # Created upstream PR @ https://github.com/ghcjs/jsaddle/pull/119 diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml index 46470d75db8..cbca22b9f7e 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml @@ -2821,6 +2821,7 @@ extra-packages: - sbv == 7.13 # required for pkgs.petrinizer - gi-gdk == 3.0.24 # 2021-05-07: For haskell-gi 0.25 without gtk4 - gi-gtk < 4.0 # 2021-05-07: For haskell-gi 0.25 without gtk4 + - gi-gdkx11 == 3.0.11 # 2021-05-07: For haskell-gi 0.25 without gtk4 package-maintainers: peti: diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 16b9400d01a..86afed3a600 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -103785,6 +103785,29 @@ self: { license = lib.licenses.lgpl21Only; }) {inherit (pkgs) gtk3;}; + "gi-gdkx11_3_0_11" = callPackage + ({ mkDerivation, base, bytestring, Cabal, containers, gi-cairo + , gi-gdk, gi-gio, gi-gobject, gi-xlib, gtk3, haskell-gi + , haskell-gi-base, haskell-gi-overloading, text, transformers + }: + mkDerivation { + pname = "gi-gdkx11"; + version = "3.0.11"; + sha256 = "07r47fpx6rvsahgnv8g741fl6h1s6y1xrlyacbpc3d8cv7x4aax2"; + setupHaskellDepends = [ + base Cabal gi-cairo gi-gdk gi-gio gi-gobject gi-xlib haskell-gi + ]; + libraryHaskellDepends = [ + base bytestring containers gi-cairo gi-gdk gi-gio gi-gobject + gi-xlib haskell-gi haskell-gi-base haskell-gi-overloading text + transformers + ]; + libraryPkgconfigDepends = [ gtk3 ]; + description = "GdkX11 bindings"; + license = lib.licenses.lgpl21Only; + hydraPlatforms = lib.platforms.none; + }) {inherit (pkgs) gtk3;}; + "gi-gdkx11_4_0_3" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, gi-cairo , gi-gdk, gi-gio, gi-gobject, gi-xlib, gtk4-x11, haskell-gi |