public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

gjs: 1.68.0 → 1.68.1

This commit is contained in:
Jan Tojnar 2021-05-06 17:32:27 +00:00
parent 7275ef4358
commit 18eace0739
No known key found for this signature in database
GPG Key ID: 7FAB2A15F7A607A4
1 changed files with 7 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
pkgs/development/libraries/gjs/default.nix
View File

@ -1,6 +1,6 @@
{ fetchurl { fetchurl
, fetchpatch , lib
, lib, stdenv , stdenv
, meson , meson
, ninja , ninja
, pkg-config , pkg-config
@ -30,20 +30,16 @@ let
]; ];
in stdenv.mkDerivation rec { in stdenv.mkDerivation rec {
pname = "gjs"; pname = "gjs";
version = "1.68.0"; version = "1.68.1";
outputs = [ "out" "dev" "installedTests" ];
src = fetchurl { src = fetchurl {
url = "mirror://gnome/sources/gjs/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; url = "mirror://gnome/sources/gjs/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "1vqsmzy2wmyhmq37y2c6jl0wq4xnicf0z7k6jaxn3aw11sh783ph"; sha256 = "0w2cbfpmc6alz7z8ycchhlkn586av5y8zk2xmgwzq10i0k13xyig";
}; };
patches = [ patches = [
# Fixes https://gitlab.gnome.org/GNOME/gnome-shell/-/issues/3961.
(fetchpatch {
url = "https://gitlab.gnome.org/GNOME/gjs/-/commit/58337929c338e7b5c0a35196d783d3b2be542900.patch";
sha256 = "QgmU+d838fU5LiS4lhTF+179U1lY1L5tJbYtX/oc68k=";
})
# Hard-code various paths # Hard-code various paths
./fix-paths.patch ./fix-paths.patch
@ -51,8 +47,6 @@ in stdenv.mkDerivation rec {
./installed-tests-path.patch ./installed-tests-path.patch
]; ];
outputs = [ "out" "dev" "installedTests" ];
nativeBuildInputs = [ nativeBuildInputs = [
meson meson
ninja ninja
@ -98,6 +92,7 @@ in stdenv.mkDerivation rec {
mkdir -p $out/lib $installedTests/libexec/installed-tests/gjs mkdir -p $out/lib $installedTests/libexec/installed-tests/gjs
ln -s $PWD/libgjs.so.0 $out/lib/libgjs.so.0 ln -s $PWD/libgjs.so.0 $out/lib/libgjs.so.0
ln -s $PWD/installed-tests/js/libgimarshallingtests.so $installedTests/libexec/installed-tests/gjs/libgimarshallingtests.so ln -s $PWD/installed-tests/js/libgimarshallingtests.so $installedTests/libexec/installed-tests/gjs/libgimarshallingtests.so
ln -s $PWD/installed-tests/js/libgjstesttools/libgjstesttools.so $installedTests/libexec/installed-tests/gjs/libgjstesttools.so
ln -s $PWD/installed-tests/js/libregress.so $installedTests/libexec/installed-tests/gjs/libregress.so ln -s $PWD/installed-tests/js/libregress.so $installedTests/libexec/installed-tests/gjs/libregress.so
ln -s $PWD/installed-tests/js/libwarnlib.so $installedTests/libexec/installed-tests/gjs/libwarnlib.so ln -s $PWD/installed-tests/js/libwarnlib.so $installedTests/libexec/installed-tests/gjs/libwarnlib.so
''; '';