diff options
| author | volth <volth@volth.com> | 2019-08-13 21:52:01 +0000 |
|---|---|---|
| committer | volth <volth@volth.com> | 2019-08-17 10:54:38 +0000 |
| commit | c814d72b517bb201c8bbbfc64e386c7023352886 (patch) | |
| tree | 3a7b3bb7326a2087a34e5333aa8dbc367ec2deb1 /pkgs/development/libraries/glib/default.nix | |
| parent | fe9a3e3e63fa59c8014d454b0efd3231bdd19350 (diff) | |
| download | nixpkgs-c814d72b517bb201c8bbbfc64e386c7023352886.tar nixpkgs-c814d72b517bb201c8bbbfc64e386c7023352886.tar.gz nixpkgs-c814d72b517bb201c8bbbfc64e386c7023352886.tar.bz2 nixpkgs-c814d72b517bb201c8bbbfc64e386c7023352886.tar.lz nixpkgs-c814d72b517bb201c8bbbfc64e386c7023352886.tar.xz nixpkgs-c814d72b517bb201c8bbbfc64e386c7023352886.tar.zst nixpkgs-c814d72b517bb201c8bbbfc64e386c7023352886.zip | |
treewide: name -> pname
Diffstat (limited to 'pkgs/development/libraries/glib/default.nix')
| -rw-r--r-- | pkgs/development/libraries/glib/default.nix | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/pkgs/development/libraries/glib/default.nix b/pkgs/development/libraries/glib/default.nix index 269c41df797..48e65cc063b 100644 --- a/pkgs/development/libraries/glib/default.nix +++ b/pkgs/development/libraries/glib/default.nix @@ -50,10 +50,11 @@ let in stdenv.mkDerivation rec { - name = "glib-${version}"; + pname = "glib"; + inherit version; src = fetchurl { - url = "mirror://gnome/sources/glib/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; + url = "mirror://gnome/sources/glib/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "0v7vpx2md1gn0wwiirn7g4bhf2csfvcr03y96q2zv97ain6sp3zz"; }; @@ -139,7 +140,7 @@ stdenv.mkDerivation rec { sed -i "$dev/bin/glib-gettextize" -e "s|^gettext_dir=.*|gettext_dir=$dev/share/glib-2.0/gettext|" # This file is *included* in gtk3 and would introduce runtime reference via __FILE__. - sed '1i#line 1 "${name}/include/glib-2.0/gobject/gobjectnotifyqueue.c"' \ + sed '1i#line 1 "${pname}-${version}/include/glib-2.0/gobject/gobjectnotifyqueue.c"' \ -i "$dev"/include/glib-2.0/gobject/gobjectnotifyqueue.c '' + optionalString (stdenv.hostPlatform != stdenv.buildPlatform) '' cp -r ${buildPackages.glib.devdoc} $devdoc @@ -148,7 +149,7 @@ stdenv.mkDerivation rec { checkInputs = [ tzdata libxml2 desktop-file-utils shared-mime-info ]; preCheck = optionalString doCheck '' - export LD_LIBRARY_PATH="$NIX_BUILD_TOP/${name}/glib/.libs:$LD_LIBRARY_PATH" + export LD_LIBRARY_PATH="$NIX_BUILD_TOP/${pname}-${version}/glib/.libs:$LD_LIBRARY_PATH" export TZDIR="${tzdata}/share/zoneinfo" export XDG_CACHE_HOME="$TMP" export XDG_RUNTIME_HOME="$TMP" |