diff --git a/pkgs/development/libraries/clutter-gst/default.nix b/pkgs/development/libraries/clutter-gst/default.nix index 3c88327c790b..2db4f6bf1ab8 100644 --- a/pkgs/development/libraries/clutter-gst/default.nix +++ b/pkgs/development/libraries/clutter-gst/default.nix @@ -1,13 +1,13 @@ { fetchurl, stdenv, pkgconfig, clutter, gtk3, glib, cogl, gnome3, gdk-pixbuf }: -let +stdenv.mkDerivation rec { pname = "clutter-gst"; version = "3.0.27"; -in stdenv.mkDerivation rec { - name = "${pname}-${version}"; + + outputs = [ "out" "dev" ]; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; + url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "17czmpl92dzi4h3rn5rishk015yi3jwiw29zv8qan94xcmnbssgy"; }; diff --git a/pkgs/development/libraries/gtkd/default.nix b/pkgs/development/libraries/gtkd/default.nix index 0b2df597be57..2cad4a19a0f3 100644 --- a/pkgs/development/libraries/gtkd/default.nix +++ b/pkgs/development/libraries/gtkd/default.nix @@ -7,6 +7,8 @@ in stdenv.mkDerivation rec { pname = "gtkd"; version = "3.9.0"; + outputs = [ "out" "dev" ]; + src = fetchzip { url = "https://gtkd.org/Downloads/sources/GtkD-${version}.zip"; sha256 = "12kc4s5gp6gn456d8pzhww1ggi9qbxldmcpp6855297g2x8xxy5p"; @@ -118,6 +120,15 @@ in stdenv.mkDerivation rec { "PKG_CONFIG=${pkgconfig}/bin/pkg-config" ]; + # The .pc files does not declare an `includedir=`, so the multiple + # outputs setup hook misses this. + postFixup = '' + for pc in $dev/lib/pkgconfig/*; do + substituteInPlace $pc \ + --replace "$out/include" "$dev/include" + done + ''; + meta = with stdenv.lib; { description = "D binding and OO wrapper for GTK"; homepage = https://gtkd.org; diff --git a/pkgs/development/libraries/libappindicator/default.nix b/pkgs/development/libraries/libappindicator/default.nix index e9fccaf28abf..d09684a04438 100644 --- a/pkgs/development/libraries/libappindicator/default.nix +++ b/pkgs/development/libraries/libappindicator/default.nix @@ -19,6 +19,8 @@ stdenv.mkDerivation rec { versionMajor = "12.10"; versionMinor = "0"; + outputs = [ "out" "dev" ]; + src = fetchurl { url = "${meta.homepage}/${versionMajor}/${version}/+download/libappindicator-${version}.tar.gz"; sha256 = "17xlqd60v0zllrxp8bgq3k5a1jkj0svkqn8rzllcyjh8k0gpr46m"; diff --git a/pkgs/development/libraries/libgnomekbd/default.nix b/pkgs/development/libraries/libgnomekbd/default.nix index 21523bf2e1a5..f35f3f87fbeb 100644 --- a/pkgs/development/libraries/libgnomekbd/default.nix +++ b/pkgs/development/libraries/libgnomekbd/default.nix @@ -4,6 +4,8 @@ stdenv.mkDerivation rec { pname = "libgnomekbd"; version = "3.26.1"; + outputs = [ "out" "dev" ]; + src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "0y962ykn3rr9gylj0pwpww7bi20lmhvsw6qvxs5bisbn2mih5jpp"; diff --git a/pkgs/development/libraries/libnotify/default.nix b/pkgs/development/libraries/libnotify/default.nix index 59039aadb895..f51383833417 100644 --- a/pkgs/development/libraries/libnotify/default.nix +++ b/pkgs/development/libraries/libnotify/default.nix @@ -14,6 +14,8 @@ stdenv.mkDerivation rec { pname = "libnotify"; version = "0.7.8"; + outputs = [ "out" "dev" ]; + src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "1371csx0n92g60b5dmai4mmzdnx8081mc3kcgc6a0xipcq5rw839"; diff --git a/pkgs/development/libraries/liboauth/default.nix b/pkgs/development/libraries/liboauth/default.nix index ea792b007bae..46e3e65ff80b 100644 --- a/pkgs/development/libraries/liboauth/default.nix +++ b/pkgs/development/libraries/liboauth/default.nix @@ -9,6 +9,8 @@ stdenv.mkDerivation rec { sha256 = "07w1aq8y8wld43wmbk2q8134p3bfkp2vma78mmsfgw2jn1bh3xhd"; }; + outputs = [ "out" "dev" ]; + nativeBuildInputs = [ pkgconfig ]; propagatedBuildInputs = [ nss nspr ]; diff --git a/pkgs/development/libraries/libpeas/default.nix b/pkgs/development/libraries/libpeas/default.nix index cdb1b95935f4..a4632924a93a 100644 --- a/pkgs/development/libraries/libpeas/default.nix +++ b/pkgs/development/libraries/libpeas/default.nix @@ -6,6 +6,8 @@ stdenv.mkDerivation rec { pname = "libpeas"; version = "1.24.0"; + outputs = [ "out" "dev" ]; + src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "1yg6r0srz3knhgvplprl3pikrq5c02dmdxgfwcynd6hjih9h16hb";