summary refs log tree commit diff
path: root/pkgs/development/libraries
diff options
context:
space:
mode:
authorworldofpeace <worldofpeace@protonmail.ch>2019-12-14 22:25:11 -0500
committerGitHub <noreply@github.com>2019-12-14 22:25:11 -0500
commitbfcc281a2738714a88fc4e0fbaad5055dfebbb44 (patch)
tree6aad62ecff8578e967178304c5ad5b341c9cfdf7 /pkgs/development/libraries
parent367676ce82b3b5e63f322b335ed8a2bc3b4216bc (diff)
parent47dcb0439a7f891645471c8d003e0d3466978229 (diff)
downloadnixpkgs-bfcc281a2738714a88fc4e0fbaad5055dfebbb44.tar
nixpkgs-bfcc281a2738714a88fc4e0fbaad5055dfebbb44.tar.gz
nixpkgs-bfcc281a2738714a88fc4e0fbaad5055dfebbb44.tar.bz2
nixpkgs-bfcc281a2738714a88fc4e0fbaad5055dfebbb44.tar.lz
nixpkgs-bfcc281a2738714a88fc4e0fbaad5055dfebbb44.tar.xz
nixpkgs-bfcc281a2738714a88fc4e0fbaad5055dfebbb44.tar.zst
nixpkgs-bfcc281a2738714a88fc4e0fbaad5055dfebbb44.zip
Merge pull request #75138 from mkg20001/feat/add-xapps-cinnamon
cinnamon.xapps: init at 1.6.8
Diffstat (limited to 'pkgs/development/libraries')
-rw-r--r--pkgs/development/libraries/libgnomekbd/default.nix20
1 files changed, 13 insertions, 7 deletions
diff --git a/pkgs/development/libraries/libgnomekbd/default.nix b/pkgs/development/libraries/libgnomekbd/default.nix
index 0951ab1fe0c..21523bf2e1a 100644
--- a/pkgs/development/libraries/libgnomekbd/default.nix
+++ b/pkgs/development/libraries/libgnomekbd/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, file, intltool, glib, gtk3, libxklavier, makeWrapper, gnome3 }:
+{ stdenv, fetchurl, pkgconfig, file, intltool, glib, gtk3, libxklavier, wrapGAppsHook, gnome3 }:
 
 stdenv.mkDerivation rec {
   pname = "libgnomekbd";
@@ -13,13 +13,19 @@ stdenv.mkDerivation rec {
     updateScript = gnome3.updateScript { packageName = pname; };
   };
 
-  nativeBuildInputs = [ pkgconfig file intltool makeWrapper ];
-  buildInputs = [ glib gtk3 libxklavier ];
+  nativeBuildInputs = [
+    file
+    intltool
+    pkgconfig
+    wrapGAppsHook
+  ];
 
-  preFixup = ''
-    wrapProgram $out/bin/gkbd-keyboard-display \
-      --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH"
-  '';
+  # Requires in libgnomekbd.pc
+  propagatedBuildInputs = [
+    gtk3
+    libxklavier
+    glib
+  ];
 
   meta = with stdenv.lib; {
     description = "Keyboard management library";