diff options
| author | Jan Tojnar <jtojnar@gmail.com> | 2018-08-30 18:50:22 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-08-30 18:50:22 +0100 |
| commit | 4caab41c1b4b57d9d971a1c1e5c4da35648615d4 (patch) | |
| tree | e6814d5064422ca2abd8e4d3014ebe85ed04968a /pkgs/desktops/gnome-3/core/libgee/default.nix | |
| parent | 11dab7bd4aa0eaf0f0cead46427a67f5deaf3221 (diff) | |
| parent | 3ddead70852a5d484b063fec52973c56bad22601 (diff) | |
| download | nixlib-4caab41c1b4b57d9d971a1c1e5c4da35648615d4.tar nixlib-4caab41c1b4b57d9d971a1c1e5c4da35648615d4.tar.gz nixlib-4caab41c1b4b57d9d971a1c1e5c4da35648615d4.tar.bz2 nixlib-4caab41c1b4b57d9d971a1c1e5c4da35648615d4.tar.lz nixlib-4caab41c1b4b57d9d971a1c1e5c4da35648615d4.tar.xz nixlib-4caab41c1b4b57d9d971a1c1e5c4da35648615d4.tar.zst nixlib-4caab41c1b4b57d9d971a1c1e5c4da35648615d4.zip | |
Merge pull request #37693 from jtojnar/min-nix-two
treewide: Re-add reverted Nix 2 syntax features
Diffstat (limited to 'pkgs/desktops/gnome-3/core/libgee/default.nix')
| -rw-r--r-- | pkgs/desktops/gnome-3/core/libgee/default.nix | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/pkgs/desktops/gnome-3/core/libgee/default.nix b/pkgs/desktops/gnome-3/core/libgee/default.nix index a5ce9ee5e105..a65d0f401f0e 100644 --- a/pkgs/desktops/gnome-3/core/libgee/default.nix +++ b/pkgs/desktops/gnome-3/core/libgee/default.nix @@ -6,6 +6,8 @@ in stdenv.mkDerivation rec { name = "${pname}-${version}"; + outputs = [ "out" "dev" ]; + src = fetchurl { url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz"; sha256 = "0c26x8gi3ivmhlbqcmiag4jwrkvcy28ld24j55nqr3jikb904a5v"; @@ -13,11 +15,12 @@ stdenv.mkDerivation rec { doCheck = true; - patches = [ ./fix_introspection_paths.patch ]; - nativeBuildInputs = [ pkgconfig autoconf vala gobjectIntrospection ]; buildInputs = [ glib ]; + 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; |