summary refs log tree commit diff
path: root/pkgs/games/planetaryannihilation
diff options
context:
space:
mode:
authorKirill Boltaev <aske@fmap.me>2016-09-12 00:24:51 +0300
committerKirill Boltaev <aske@fmap.me>2016-09-12 18:26:06 +0300
commitbccd75094fd5108b3d834ad3a86e056eed3b0337 (patch)
tree8954184c0376ef2f8218b7df7049edde7ef6a49b /pkgs/games/planetaryannihilation
parent30107249b1a5681771591cd65aa4f1c98f4cb023 (diff)
downloadnixpkgs-bccd75094fd5108b3d834ad3a86e056eed3b0337.tar
nixpkgs-bccd75094fd5108b3d834ad3a86e056eed3b0337.tar.gz
nixpkgs-bccd75094fd5108b3d834ad3a86e056eed3b0337.tar.bz2
nixpkgs-bccd75094fd5108b3d834ad3a86e056eed3b0337.tar.lz
nixpkgs-bccd75094fd5108b3d834ad3a86e056eed3b0337.tar.xz
nixpkgs-bccd75094fd5108b3d834ad3a86e056eed3b0337.tar.zst
nixpkgs-bccd75094fd5108b3d834ad3a86e056eed3b0337.zip
treewide: explicitly specify gtk and related package versions
Diffstat (limited to 'pkgs/games/planetaryannihilation')
-rw-r--r--pkgs/games/planetaryannihilation/default.nix6
1 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/games/planetaryannihilation/default.nix b/pkgs/games/planetaryannihilation/default.nix
index 5e5da9497e5..bd7e1188928 100644
--- a/pkgs/games/planetaryannihilation/default.nix
+++ b/pkgs/games/planetaryannihilation/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, config, fetchurl, patchelf, makeWrapper, gtk, glib, udev, alsaLib, atk
+{ stdenv, config, fetchurl, patchelf, makeWrapper, gtk2, glib, udev, alsaLib, atk
 , nspr, fontconfig, cairo, pango, nss, freetype, gnome3, gdk_pixbuf, curl, systemd, xorg }:
 
 # TODO: use dynamic attributes once Nix 1.7 is out
@@ -34,9 +34,9 @@ stdenv.mkDerivation {
     ln -s ${systemd}/lib/libudev.so.1 $out/lib/libudev.so.0
 
     patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" "$out/PA"
-    patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" --set-rpath "${stdenv.lib.makeLibraryPath [ stdenv.cc.cc.lib xorg.libXdamage xorg.libXfixes gtk glib stdenv.glibc.out "$out" xorg.libXext pango udev xorg.libX11 xorg.libXcomposite alsaLib atk nspr fontconfig cairo pango nss freetype gnome3.gconf gdk_pixbuf xorg.libXrender ]}:{stdenv.cc.cc.lib}/lib64:${stdenv.glibc.out}/lib64" "$out/host/CoherentUI_Host" 
+    patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" --set-rpath "${stdenv.lib.makeLibraryPath [ stdenv.cc.cc.lib xorg.libXdamage xorg.libXfixes gtk2 glib stdenv.glibc.out "$out" xorg.libXext pango udev xorg.libX11 xorg.libXcomposite alsaLib atk nspr fontconfig cairo pango nss freetype gnome3.gconf gdk_pixbuf xorg.libXrender ]}:{stdenv.cc.cc.lib}/lib64:${stdenv.glibc.out}/lib64" "$out/host/CoherentUI_Host"
 
-    wrapProgram $out/PA --prefix LD_LIBRARY_PATH : "${stdenv.lib.makeLibraryPath [ stdenv.cc.cc.lib stdenv.glibc.out xorg.libX11 xorg.libXcursor gtk glib curl "$out" ]}:${stdenv.cc.cc.lib}/lib64:${stdenv.glibc.out}/lib64"
+    wrapProgram $out/PA --prefix LD_LIBRARY_PATH : "${stdenv.lib.makeLibraryPath [ stdenv.cc.cc.lib stdenv.glibc.out xorg.libX11 xorg.libXcursor gtk2 glib curl "$out" ]}:${stdenv.cc.cc.lib}/lib64:${stdenv.glibc.out}/lib64"
 
     for f in $out/lib/*; do
       patchelf --set-rpath "${stdenv.lib.makeLibraryPath [ stdenv.cc.cc.lib curl xorg.libX11 stdenv.glibc.out xorg.libXcursor "$out" ]}:${stdenv.cc.cc.lib}/lib64:${stdenv.glibc.out}/lib64" $f