diff options
| author | Frederik Rietdijk <fridh@fridh.nl> | 2019-08-03 07:42:50 +0200 |
|---|---|---|
| committer | Frederik Rietdijk <fridh@fridh.nl> | 2019-08-03 07:42:50 +0200 |
| commit | 53328909da75752522c55f8d94c6553d740f9729 (patch) | |
| tree | ddbf6026aab3331c9bab6de36a3f49e1d02493a1 /pkgs/applications/science | |
| parent | 49f281d287d7f31079994b06235efa508585001e (diff) | |
| parent | cd9846239a8ef48a0630d80b0c5ebcead09b4219 (diff) | |
| download | nixpkgs-53328909da75752522c55f8d94c6553d740f9729.tar nixpkgs-53328909da75752522c55f8d94c6553d740f9729.tar.gz nixpkgs-53328909da75752522c55f8d94c6553d740f9729.tar.bz2 nixpkgs-53328909da75752522c55f8d94c6553d740f9729.tar.lz nixpkgs-53328909da75752522c55f8d94c6553d740f9729.tar.xz nixpkgs-53328909da75752522c55f8d94c6553d740f9729.tar.zst nixpkgs-53328909da75752522c55f8d94c6553d740f9729.zip | |
Merge staging-next into master, closes #65497
Diffstat (limited to 'pkgs/applications/science')
| -rw-r--r-- | pkgs/applications/science/electronics/bitscope/common.nix | 4 | ||||
| -rw-r--r-- | pkgs/applications/science/logic/verifast/default.nix | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/pkgs/applications/science/electronics/bitscope/common.nix b/pkgs/applications/science/electronics/bitscope/common.nix index 64777b5a0ac..9101f1fdbe5 100644 --- a/pkgs/applications/science/electronics/bitscope/common.nix +++ b/pkgs/applications/science/electronics/bitscope/common.nix @@ -2,7 +2,7 @@ , buildFHSUserEnv , cairo , dpkg -, gdk_pixbuf +, gdk-pixbuf , glib , gtk2-x11 , makeWrapper @@ -39,7 +39,7 @@ let libs = attrs.libs or [ atk cairo - gdk_pixbuf + gdk-pixbuf glib gtk2-x11 pango diff --git a/pkgs/applications/science/logic/verifast/default.nix b/pkgs/applications/science/logic/verifast/default.nix index 22eb5d07f1c..360f75cc6f0 100644 --- a/pkgs/applications/science/logic/verifast/default.nix +++ b/pkgs/applications/science/logic/verifast/default.nix @@ -1,10 +1,10 @@ -{ stdenv, fetchurl, gtk2, gdk_pixbuf, atk, pango, glib, cairo, freetype +{ stdenv, fetchurl, gtk2, gdk-pixbuf, atk, pango, glib, cairo, freetype , fontconfig, libxml2, gnome2 }: let libPath = stdenv.lib.makeLibraryPath - [ stdenv.cc.libc stdenv.cc.cc gtk2 gdk_pixbuf atk pango glib cairo + [ stdenv.cc.libc stdenv.cc.cc gtk2 gdk-pixbuf atk pango glib cairo freetype fontconfig libxml2 gnome2.gtksourceview ] + ":${stdenv.cc.cc.lib}/lib64:$out/libexec"; |