diff options
| author | Jan Tojnar <jtojnar@gmail.com> | 2018-03-21 08:35:54 +0100 |
|---|---|---|
| committer | Jan Tojnar <jtojnar@gmail.com> | 2018-03-22 07:48:11 +0100 |
| commit | bf916629674cd536786fa2854ba1fe90e440b93e (patch) | |
| tree | 7ef841ff4605cdcab95d6e649736fb3733408245 /pkgs | |
| parent | 819d766f777494e07ce9aeb30160b0d3426bfbec (diff) | |
| download | nixpkgs-bf916629674cd536786fa2854ba1fe90e440b93e.tar nixpkgs-bf916629674cd536786fa2854ba1fe90e440b93e.tar.gz nixpkgs-bf916629674cd536786fa2854ba1fe90e440b93e.tar.bz2 nixpkgs-bf916629674cd536786fa2854ba1fe90e440b93e.tar.lz nixpkgs-bf916629674cd536786fa2854ba1fe90e440b93e.tar.xz nixpkgs-bf916629674cd536786fa2854ba1fe90e440b93e.tar.zst nixpkgs-bf916629674cd536786fa2854ba1fe90e440b93e.zip | |
libwnck3: build gir
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/development/libraries/libwnck/3.x.nix | 38 | ||||
| -rw-r--r-- | pkgs/development/libraries/libwnck/install_introspection_to_prefix.patch | 12 |
2 files changed, 24 insertions, 26 deletions
diff --git a/pkgs/development/libraries/libwnck/3.x.nix b/pkgs/development/libraries/libwnck/3.x.nix index 6a835157d96..f2d05d14d69 100644 --- a/pkgs/development/libraries/libwnck/3.x.nix +++ b/pkgs/development/libraries/libwnck/3.x.nix @@ -1,28 +1,38 @@ -{stdenv, fetchurl, pkgconfig, libX11, gtk3, intltool}: +{stdenv, fetchurl, pkgconfig, libX11, gtk3, intltool, gobjectIntrospection, gnome3}: -stdenv.mkDerivation rec{ - name = "libwnck-${version}"; - version = "${majorVer}.${minorVer}.${patchVer}"; - - majorVer = "3"; - minorVer = "24"; - patchVer = "1"; +let + pname = "libwnck"; + version = "3.24.1"; +in stdenv.mkDerivation rec{ + name = "${pname}-${version}"; src = fetchurl { - url = "mirror://gnome/sources/libwnck/${majorVer}.${minorVer}/${name}.tar.xz"; + url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz"; sha256 = "010zk9zvydggxqnxfml3scml5yxmpjy90irpqcayrzw26lldr9mg"; }; outputs = [ "out" "dev" "devdoc" ]; outputBin = "dev"; - patches = [ ./install_introspection_to_prefix.patch ]; + configureFlags = [ "--enable-introspection" ]; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ intltool ]; + nativeBuildInputs = [ pkgconfig intltool gobjectIntrospection ]; propagatedBuildInputs = [ libX11 gtk3 ]; - meta = { - platforms = stdenv.lib.platforms.linux; + PKG_CONFIG_GOBJECT_INTROSPECTION_1_0_GIRDIR = "${placeholder "dev"}/share/gir-1.0"; + PKG_CONFIG_GOBJECT_INTROSPECTION_1_0_TYPELIBDIR = "${placeholder "out"}/lib/girepository-1.0"; + + passthru = { + updateScript = gnome3.updateScript { + packageName = pname; + attrPath = "gnome3.${pname}"; + }; + }; + + meta = with stdenv.lib; { + description = "Library to manage X windows and workspaces (via pagers, tasklists, etc.)"; + license = licenses.lgpl21Plus; + platforms = platforms.linux; + maintainers = []; }; } diff --git a/pkgs/development/libraries/libwnck/install_introspection_to_prefix.patch b/pkgs/development/libraries/libwnck/install_introspection_to_prefix.patch deleted file mode 100644 index 1bcf4a12ea3..00000000000 --- a/pkgs/development/libraries/libwnck/install_introspection_to_prefix.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- libwnck-3.4.7/configure 2013-08-20 14:46:14.000000000 +0000 -+++ libwnck-3.4.7-fix/configure 2014-01-05 17:18:56.665427787 +0000 -@@ -16150,7 +16150,7 @@ $as_echo "$found_introspection" >&6; } - INTROSPECTION_COMPILER=`$PKG_CONFIG --variable=g_ir_compiler gobject-introspection-1.0` - INTROSPECTION_GENERATE=`$PKG_CONFIG --variable=g_ir_generate gobject-introspection-1.0` -- INTROSPECTION_GIRDIR=`$PKG_CONFIG --variable=girdir gobject-introspection-1.0` -+ INTROSPECTION_GIRDIR="${datadir}/gir-1.0" -- INTROSPECTION_TYPELIBDIR="$($PKG_CONFIG --variable=typelibdir gobject-introspection-1.0)" -+ INTROSPECTION_TYPELIBDIR="${libdir}/girepository-1.0" - INTROSPECTION_CFLAGS=`$PKG_CONFIG --cflags gobject-introspection-1.0` - INTROSPECTION_LIBS=`$PKG_CONFIG --libs gobject-introspection-1.0` - INTROSPECTION_MAKEFILE=`$PKG_CONFIG --variable=datadir gobject-introspection-1.0`/gobject-introspection-1.0/Makefile.introspection |